aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2020-06-26 23:28:33 +0200
committerjackpoz <giacomopoz@gmail.com>2020-06-26 23:37:52 +0200
commit54c701cf0db81c0062e8c5020e07db18984d0ffa (patch)
tree20ae8c2d51f4868970788417fdda90cb1fb9bc9c /src/server/game/Maps/Map.cpp
parent49da3533cd4a0fcd8b2ac7ae0bf4b105f40f8c77 (diff)
Core/Common: Replace ASSERT(false, "...") with ABORT_MSG("...")
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r--src/server/game/Maps/Map.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index ced799a9c16..e0378bfb7aa 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2991,7 +2991,7 @@ bool Map::CheckRespawn(RespawnInfo* info)
doDelete = true;
break;
default:
- ASSERT(false, "Invalid spawn type %u with spawnId %u on map %u", uint32(info->type), info->spawnId, GetId());
+ ABORT_MSG("Invalid spawn type %u with spawnId %u on map %u", uint32(info->type), info->spawnId, GetId());
return true;
}
if (doDelete)
@@ -3026,7 +3026,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 %u) on map %u", uint32(info->type), info->spawnId, GetId());
+ ABORT_MSG("Invalid spawn type %u (spawnid %u) on map %u", uint32(info->type), info->spawnId, GetId());
info->respawnTime = 0;
return false;
}
@@ -3089,7 +3089,7 @@ bool Map::AddRespawnInfo(RespawnInfo const& info)
ASSERT(bySpawnIdMap.find(info.spawnId) == bySpawnIdMap.end(), "Insertion of respawn info with id (%u,%u) into spawn id map failed - state desync.", uint32(info.type), info.spawnId);
}
else
- ASSERT(false, "Invalid respawn info for spawn id (%u,%u) being inserted", uint32(info.type), info.spawnId);
+ ABORT_MSG("Invalid respawn info for spawn id (%u,%u) being inserted", uint32(info.type), info.spawnId);
RespawnInfo * ri = new RespawnInfo(info);
ri->handle = _respawnTimes.push(ri);
@@ -3184,7 +3184,7 @@ void Map::DoRespawn(SpawnObjectType type, ObjectGuid::LowType spawnId, uint32 gr
break;
}
default:
- ASSERT(false, "Invalid spawn type %u (spawnid %u) on map %u", uint32(type), spawnId, GetId());
+ ABORT_MSG("Invalid spawn type %u (spawnid %u) on map %u", uint32(type), spawnId, GetId());
}
}
@@ -3354,7 +3354,7 @@ bool Map::SpawnGroupSpawn(uint32 groupId, bool ignoreRespawn, bool force, std::v
break;
}
default:
- ASSERT(false, "Invalid spawn type %u with spawnId %u", uint32(data->type), data->spawnId);
+ ABORT_MSG("Invalid spawn type %u with spawnId %u", uint32(data->type), data->spawnId);
return false;
}
}