mirror of
https://github.com/SWG-Source/src.git
synced 2026-08-03 03:16:01 -04:00
Added sharedPathfinding library
This commit is contained in:
@@ -111,9 +111,19 @@ endif()
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shared
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedRandom/include/public
|
||||
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedXml/include/public
|
||||
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
|
||||
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/fileInterface/include/public
|
||||
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include
|
||||
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include
|
||||
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public
|
||||
)
|
||||
|
||||
add_library(sharedUtility STATIC
|
||||
|
||||
@@ -205,7 +205,7 @@ void CachedFileManager::preloadSomeAssets ()
|
||||
if (possibleExtension)
|
||||
{
|
||||
ConstCharCrcString const extension (possibleExtension + 1);
|
||||
ExtensionMap::iterator iter = ms_extensionMap.find (&extension);
|
||||
ExtensionMap::iterator iter = ms_extensionMap.find ((const CrcString*)&extension);
|
||||
if (iter == ms_extensionMap.end ())
|
||||
{
|
||||
CachedFileInfo * const info = new CachedFileInfo (extension.getString ());
|
||||
|
||||
@@ -281,7 +281,7 @@ void InteriorLayoutReaderWriter::addObject(char const * const cellName, char con
|
||||
{
|
||||
Node * node = 0;
|
||||
TemporaryCrcString const cellNameCrcString(cellName, true);
|
||||
NodeMap::iterator iter = m_nodeMap->find(&cellNameCrcString);
|
||||
NodeMap::iterator iter = m_nodeMap->find((const CrcString*)&cellNameCrcString);
|
||||
if (iter != m_nodeMap->end())
|
||||
node = iter->second;
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user