From 68faf5bc4bc69a111eca479860215f075adcdad6 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 26 Jun 2020 23:28:33 +0200 Subject: Core/Common: Replace ASSERT(false, "...") with ABORT_MSG("...") (cherry picked from commit 54c701cf0db81c0062e8c5020e07db18984d0ffa) --- src/common/Collision/Management/MMapManager.cpp | 2 +- src/common/Collision/Management/VMapManager2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common/Collision/Management') 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); } -- cgit v1.2.3