Core/Common: Replace ASSERT(false, "...") with ABORT_MSG("...")

(cherry picked from commit 54c701cf0db81c0062e8c5020e07db18984d0ffa)

4 files changed, 18 insertions, 18 deletions

diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index da3bc28e4f6..01e1489825a 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -73,7 +73,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 d86b254604a..0e663a66023 100644
--- a/src/common/Collision/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
@@ -148,7 +148,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/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp
index fe0a68eee48..71475a2a2d9 100644
--- a/src/common/DataStores/DB2FileLoader.cpp
+++ b/src/common/DataStores/DB2FileLoader.cpp
@@ -464,7 +464,7 @@ char* DB2FileLoaderRegularImpl::AutoProduceData(uint32& indexTableSize, char**&
                             offset += sizeof(char*);
                             break;
                         default:
-                            ASSERT(false, "Unknown format character '%c' found in %s meta for field %s",
+                            ABORT_MSG("Unknown format character '%c' found in %s meta for field %s",
                                 _loadInfo->TypesString[fieldIndex], _fileName, _loadInfo->Fields[fieldIndex].Name);
                             break;
                     }
@@ -491,7 +491,7 @@ char* DB2FileLoaderRegularImpl::AutoProduceData(uint32& indexTableSize, char**&
                             offset += 2;
                             break;
                         default:
-                            ASSERT(false, "Unknown format character '%c' found in %s meta for parent field %s",
+                            ABORT_MSG("Unknown format character '%c' found in %s meta for parent field %s",
                                 _loadInfo->TypesString[fieldIndex], _fileName, _loadInfo->Fields[fieldIndex].Name);
                             break;
                     }
@@ -597,7 +597,7 @@ char* DB2FileLoaderRegularImpl::AutoProduceStrings(char** indexTable, uint32 ind
                             break;
                         }
                         default:
-                            ASSERT(false, "Unknown format character '%c' found in %s meta for field %s",
+                            ABORT_MSG("Unknown format character '%c' found in %s meta for field %s",
                                 _loadInfo->TypesString[fieldIndex], _fileName, _loadInfo->Fields[fieldIndex].Name);
                             break;
                     }
@@ -681,7 +681,7 @@ void DB2FileLoaderRegularImpl::FillParentLookup(char* dataTable)
                         *reinterpret_cast<uint32*>(&recordData[parentIdOffset]) = parentId;
                         break;
                     default:
-                        ASSERT(false, "Unhandled parent id type '%c' found in %s", _loadInfo->Meta->Fields[_loadInfo->Meta->ParentIndexField].Type, _fileName);
+                        ABORT_MSG("Unhandled parent id type '%c' found in %s", _loadInfo->Meta->Fields[_loadInfo->Meta->ParentIndexField].Type, _fileName);
                         break;
                 }
             }
@@ -855,7 +855,7 @@ T DB2FileLoaderRegularImpl::RecordGetVarInt(uint8 const* record, uint32 field, u
             return value;
         }
         default:
-            ASSERT(false, "Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
+            ABORT_MSG("Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
             break;
     }
 
@@ -885,7 +885,7 @@ uint16 DB2FileLoaderRegularImpl::GetFieldOffset(uint32 field) const
         case DB2ColumnCompression::PalletArray:
             return _columnMeta[field].CompressionData.pallet.BitOffset / 8 + _header->PackedDataOffset;
         default:
-            ASSERT(false, "Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
+            ABORT_MSG("Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
             break;
     }
 
@@ -958,7 +958,7 @@ bool DB2FileLoaderRegularImpl::IsSignedField(uint32 field) const
         case DB2ColumnCompression::Immediate:
             return false;
         default:
-            ASSERT(false, "Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
+            ABORT_MSG("Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
             break;
     }
 
@@ -991,7 +991,7 @@ char const* DB2FileLoaderRegularImpl::GetExpectedSignMismatchReason(uint32 field
         case DB2ColumnCompression::Immediate:
             return " (CompressionType is Immediate)";
         default:
-            ASSERT(false, "Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
+            ABORT_MSG("Unhandled compression type %u in %s", uint32(_columnMeta[field].CompressionType), _fileName);
             break;
     }
 
@@ -1149,7 +1149,7 @@ char* DB2FileLoaderSparseImpl::AutoProduceData(uint32& indexTableSize, char**& i
                             offset += sizeof(char*);
                             break;
                         default:
-                            ASSERT(false, "Unknown format character '%c' found in %s meta for field %s",
+                            ABORT_MSG("Unknown format character '%c' found in %s meta for field %s",
                                 _loadInfo->TypesString[fieldIndex], _fileName, _loadInfo->Fields[fieldIndex].Name);
                             break;
                     }
@@ -1176,7 +1176,7 @@ char* DB2FileLoaderSparseImpl::AutoProduceData(uint32& indexTableSize, char**& i
                             offset += 2;
                             break;
                         default:
-                            ASSERT(false, "Unknown format character '%c' found in %s meta for parent field %s",
+                            ABORT_MSG("Unknown format character '%c' found in %s meta for parent field %s",
                                 _loadInfo->TypesString[fieldIndex], _fileName, _loadInfo->Fields[fieldIndex].Name);
                             break;
                     }
@@ -1302,7 +1302,7 @@ char* DB2FileLoaderSparseImpl::AutoProduceStrings(char** indexTable, uint32 inde
                             break;
                         }
                         default:
-                            ASSERT(false, "Unknown format character '%c' found in %s meta for field %s",
+                            ABORT_MSG("Unknown format character '%c' found in %s meta for field %s",
                                 _loadInfo->TypesString[fieldIndex], _fileName, _loadInfo->Fields[fieldIndex].Name);
                             break;
                     }
@@ -1409,7 +1409,7 @@ void DB2FileLoaderSparseImpl::FillParentLookup(char* dataTable)
                         *reinterpret_cast<uint32*>(&recordData[parentIdOffset]) = parentId;
                         break;
                     default:
-                        ASSERT(false, "Unhandled parent id type '%c' found in %s", _loadInfo->Meta->Fields[_loadInfo->Meta->ParentIndexField].Type, _fileName);
+                        ABORT_MSG("Unhandled parent id type '%c' found in %s", _loadInfo->Meta->Fields[_loadInfo->Meta->ParentIndexField].Type, _fileName);
                         break;
                 }
             }
@@ -1573,7 +1573,7 @@ void DB2FileLoaderSparseImpl::CalculateAndStoreFieldOffsets(uint8 const* rawReco
                     offset += strlen(reinterpret_cast<char const*>(rawRecord) + offset) + 1;
                     break;
                 default:
-                    ASSERT(false, "Unknown format character '%c' found in %s meta", _loadInfo->Meta->Fields[field].Type, _fileName);
+                    ABORT_MSG("Unknown format character '%c' found in %s meta", _loadInfo->Meta->Fields[field].Type, _fileName);
                     break;
             }
             ++combinedField;
diff --git a/src/common/DataStores/DB2Meta.cpp b/src/common/DataStores/DB2Meta.cpp
index b08c67c37ef..9b35353ce4f 100644
--- a/src/common/DataStores/DB2Meta.cpp
+++ b/src/common/DataStores/DB2Meta.cpp
@@ -73,7 +73,7 @@ uint32 DB2Meta::GetRecordSize() const
                     size += sizeof(char*);
                     break;
                 default:
-                    ASSERT(false, "Unsupported column type specified %c", Fields[i].Type);
+                    ABORT_MSG("Unsupported column type specified %c", Fields[i].Type);
                     break;
             }
         }
@@ -124,7 +124,7 @@ uint32 DB2Meta::GetIndexFieldOffset() const
                     offset += sizeof(char*);
                     break;
                 default:
-                    ASSERT(false, "Unsupported column type specified %c", Fields[i].Type);
+                    ABORT_MSG("Unsupported column type specified %c", Fields[i].Type);
                     break;
             }
         }
@@ -168,7 +168,7 @@ int32 DB2Meta::GetParentIndexFieldOffset() const
                     offset += sizeof(char*);
                     break;
                 default:
-                    ASSERT(false, "Unsupported column type specified %c", Fields[i].Type);
+                    ABORT_MSG("Unsupported column type specified %c", Fields[i].Type);
                     break;
             }
         }