diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Collision/Management/MMapManager.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/Management/VMapManager2.cpp | 2 | ||||
| -rw-r--r-- | src/common/DataStores/DBCFileLoader.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index d983a8b1d8d..31019e2b5c7 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -69,7 +69,7 @@ namespace MMAP if (thread_safe_environment) itr = loadedMMaps.insert(MMapDataSet::value_type(mapId, nullptr)).first; else - ASSERT(false, "Invalid mapId %u passed to MMapManager after startup in thread unsafe environment", mapId); + ABORT_MSG("Invalid mapId %u passed to MMapManager after startup in thread unsafe environment", mapId); } // load and init dtNavMesh - read parameters from file diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 4a8d55e5664..76ba7e7aeb7 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -114,7 +114,7 @@ namespace VMAP if (thread_safe_environment) instanceTree = iInstanceMapTrees.insert(InstanceTreeMap::value_type(mapId, nullptr)).first; else - ASSERT(false, "Invalid mapId %u tile [%u, %u] passed to VMapManager2 after startup in thread unsafe environment", + ABORT_MSG("Invalid mapId %u tile [%u, %u] passed to VMapManager2 after startup in thread unsafe environment", mapId, tileX, tileY); } diff --git a/src/common/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp index 466087d2430..842203278fb 100644 --- a/src/common/DataStores/DBCFileLoader.cpp +++ b/src/common/DataStores/DBCFileLoader.cpp @@ -153,10 +153,10 @@ uint32 DBCFileLoader::GetFormatRecordSize(char const* format, int32* index_pos) case FT_NA_BYTE: break; case FT_LOGIC: - ASSERT(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files."); + ABORT_MSG("Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files."); break; default: - ASSERT(false && "Unknown field format character in DBCfmt.h"); + ABORT_MSG("Unknown field format character in DBCfmt.h"); break; } } @@ -243,14 +243,14 @@ char* DBCFileLoader::AutoProduceData(char const* format, uint32& records, char** offset += sizeof(char*); break; case FT_LOGIC: - ASSERT(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files."); + ABORT_MSG("Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files."); break; case FT_NA: case FT_NA_BYTE: case FT_SORT: break; default: - ASSERT(false && "Unknown field format character in DBCfmt.h"); + ABORT_MSG("Unknown field format character in DBCfmt.h"); break; } } @@ -298,14 +298,14 @@ char* DBCFileLoader::AutoProduceStrings(char const* format, char* dataTable) break; } case FT_LOGIC: - ASSERT(false && "Attempted to load DBC files that does not have field types that match what is in the core. Check DBCfmt.h or your DBC files."); + ABORT_MSG("Attempted to load DBC files that does not have field types that match what is in the core. Check DBCfmt.h or your DBC files."); break; case FT_NA: case FT_NA_BYTE: case FT_SORT: break; default: - ASSERT(false && "Unknown field format character in DBCfmt.h"); + ABORT_MSG("Unknown field format character in DBCfmt.h"); break; } } |