diff options
| author | jackpoz <giacomopoz@gmail.com> | 2020-06-26 23:28:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-19 22:17:42 +0100 |
| commit | 68faf5bc4bc69a111eca479860215f075adcdad6 (patch) | |
| tree | 051926e05d7750b5fb3bd9b4c7afc0d243aed501 /src/server/game/Maps | |
| parent | f7c1ae01f83449348ba1cd275188e895f00e3422 (diff) | |
Core/Common: Replace ASSERT(false, "...") with ABORT_MSG("...")
(cherry picked from commit 54c701cf0db81c0062e8c5020e07db18984d0ffa)
Diffstat (limited to 'src/server/game/Maps')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index d3d32e55846..ce111ce2b81 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3176,7 +3176,7 @@ bool Map::CheckRespawn(RespawnInfo* info) doDelete = true; break; default: - ASSERT(false, "Invalid spawn type %u with spawnId " UI64FMTD " on map %u", uint32(info->type), info->spawnId, GetId()); + ABORT_MSG("Invalid spawn type %u with spawnId " UI64FMTD " on map %u", uint32(info->type), info->spawnId, GetId()); return true; } if (doDelete) @@ -3213,7 +3213,7 @@ bool Map::CheckRespawn(RespawnInfo* info) else if (info->type == SPAWN_TYPE_CREATURE) sPoolMgr->UpdatePool<Creature>(poolId, info->spawnId); else - ASSERT(false, "Invalid spawn type %u (spawnid " UI64FMTD ") on map %u", uint32(info->type), info->spawnId, GetId()); + ABORT_MSG("Invalid spawn type %u (spawnid " UI64FMTD ") on map %u", uint32(info->type), info->spawnId, GetId()); info->respawnTime = 0; return false; } @@ -3278,7 +3278,7 @@ bool Map::AddRespawnInfo(RespawnInfo const& info) ASSERT(bySpawnIdMap->find(info.spawnId) == bySpawnIdMap->end(), "Insertion of respawn info with id (%u," UI64FMTD ") into spawn id map failed - state desync.", uint32(info.type), info.spawnId); } else - ASSERT(false, "Invalid respawn info for spawn id (%u," UI64FMTD ") being inserted", uint32(info.type), info.spawnId); + ABORT_MSG("Invalid respawn info for spawn id (%u," UI64FMTD ") being inserted", uint32(info.type), info.spawnId); RespawnInfo * ri = new RespawnInfo(info); ri->handle = _respawnTimes.push(ri); @@ -3378,7 +3378,7 @@ void Map::DoRespawn(SpawnObjectType type, ObjectGuid::LowType spawnId, uint32 gr break; } default: - ASSERT(false, "Invalid spawn type %u (spawnid " UI64FMTD ") on map %u", uint32(type), spawnId, GetId()); + ABORT_MSG("Invalid spawn type %u (spawnid " UI64FMTD ") on map %u", uint32(type), spawnId, GetId()); } } @@ -3560,7 +3560,7 @@ bool Map::SpawnGroupSpawn(uint32 groupId, bool ignoreRespawn, bool force, std::v break; } default: - ASSERT(false, "Invalid spawn type %u with spawnId " UI64FMTD, uint32(data->type), data->spawnId); + ABORT_MSG("Invalid spawn type %u with spawnId " UI64FMTD, uint32(data->type), data->spawnId); return false; } } diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 48e8c49a4a9..80080876d02 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -832,7 +832,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> switch (type) { default: - ASSERT(false); + ABORT(); case SPAWN_TYPE_CREATURE: return &_creatureRespawnTimesBySpawnId; case SPAWN_TYPE_GAMEOBJECT: @@ -846,7 +846,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> switch (type) { default: - ASSERT(false); + ABORT(); case SPAWN_TYPE_CREATURE: return &_creatureRespawnTimesBySpawnId; case SPAWN_TYPE_GAMEOBJECT: |