josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 54c701cf0db81c0062e8c5020e07db18984d0ffa)
This commit is contained in:
jackpoz
2022-01-19 22:17:42 +01:00
committed by Shauren
parent f7c1ae01f8
commit 68faf5bc4b
18 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Collision/Management/MMapManager.cpp
+1 -1
View File
@@ -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
src/common/Collision/Management/VMapManager2.cpp
+1 -1
View File
@@ -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);
}
src/common/DataStores/DB2FileLoader.cpp
+13 -13
View File
@@ -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;
src/common/DataStores/DB2Meta.cpp
+3 -3
View File
@@ -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;
}
}
src/server/game/Battlegrounds/BattlegroundScore.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void BattlegroundScore::UpdateScore(uint32 type, uint32 value)
HealingDone += value;
break;
default:
ASSERT(false, "Not implemented Battleground score type %u!", type);
ABORT_MSG("Not implemented Battleground score type %u!", type);
break;
}
}
src/server/game/Combat/ThreatManager.cpp
+1 -1
View File
@@ -579,7 +579,7 @@ ThreatReference const* ThreatManager::ReselectVictim()
++it;
}
// we should have found the old victim at some point in the loop above, so execution should never get to this point
ASSERT(false, "Current victim not found in sorted threat list even though it has a reference - manager desync!");
ABORT_MSG("Current victim not found in sorted threat list even though it has a reference - manager desync!");
return nullptr;
}
src/server/game/Conditions/ConditionMgr.cpp
+1 -1
View File
@@ -766,7 +766,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const
mask |= GRID_MAP_TYPE_MASK_PLAYER;
break;
default:
ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!");
ABORT_MSG("Condition::GetSearcherTypeMaskForCondition - missing condition handling!");
break;
}
return mask;
src/server/game/DungeonFinding/LFGMgr.cpp
+1 -1
View File
@@ -956,7 +956,7 @@ void LFGMgr::MakeNewGroup(LfgProposal const& proposal)
dpsPlayers.push_back(guid);
break;
default:
ASSERT(false, "Invalid LFG role %u", it->second.role);
ABORT_MSG("Invalid LFG role %u", it->second.role);
break;
}
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -17096,7 +17096,7 @@ void Player::UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int3
objectiveIsNowComplete = IsQuestObjectiveProgressBarComplete(logSlot, quest);
break;
default:
ASSERT(false, "Unhandled quest objective type %u", uint32(objectiveType));
ABORT_MSG("Unhandled quest objective type %u", uint32(objectiveType));
break;
}
}
src/server/game/Entities/Unit/Unit.cpp
+1 -1
View File
@@ -8701,7 +8701,7 @@ void Unit::UpdateUnitMod(UnitMods unitMod)
case UNIT_MOD_DAMAGE_RANGED: UpdateDamagePhysical(RANGED_ATTACK); break;
default:
ASSERT(false, "Not implemented UnitMod %u", unitMod);
ABORT_MSG("Not implemented UnitMod %u", unitMod);
break;
}
}
src/server/game/Globals/ObjectMgr.cpp
+2 -2
View File
@@ -2904,7 +2904,7 @@ SpawnData const* ObjectMgr::GetSpawnData(SpawnObjectType type, ObjectGuid::LowTy
case SPAWN_TYPE_AREATRIGGER:
return sAreaTriggerDataStore->GetAreaTriggerSpawn(spawnId);
default:
ASSERT(false, "Invalid spawn object type %u", uint32(type));
ABORT_MSG("Invalid spawn object type %u", uint32(type));
return nullptr;
}
}
@@ -2924,7 +2924,7 @@ void ObjectMgr::OnDeleteSpawnData(SpawnData const* data)
_spawnGroupMapStore.erase(it);
return;
}
ASSERT(false, "Spawn data (%u," UI64FMTD ") being removed is member of spawn group %u, but not actually listed in the lookup table for that group!", uint32(data->type), data->spawnId, data->spawnGroupData->groupId);
ABORT_MSG("Spawn data (%u," UI64FMTD ") being removed is member of spawn group %u, but not actually listed in the lookup table for that group!", uint32(data->type), data->spawnId, data->spawnGroupData->groupId);
}
void ObjectMgr::AddGameobjectToGrid(GameObjectData const* data)
src/server/game/Maps/Map.cpp
+5 -5
View File
@@ -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;
}
}
src/server/game/Maps/Map.h
+2 -2
View File
@@ -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:
src/server/game/Pools/PoolMgr.cpp
+1 -1
View File
@@ -802,7 +802,7 @@ uint32 PoolMgr::IsPartOfAPool(SpawnObjectType type, ObjectGuid::LowType spawnId)
case SPAWN_TYPE_AREATRIGGER:
return 0;
default:
ASSERT(false, "Invalid spawn type %u passed to PoolMgr::IsPartOfPool (with spawnId " UI64FMTD ")", uint32(type), spawnId);
ABORT_MSG("Invalid spawn type %u passed to PoolMgr::IsPartOfPool (with spawnId " UI64FMTD ")", uint32(type), spawnId);
return 0;
}
}
src/server/game/Spells/Spell.cpp
+12 -12
View File
@@ -902,7 +902,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo,
m_targets.SetSrc(*m_caster);
break;
default:
ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_SRC");
ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_SRC");
break;
}
break;
@@ -919,7 +919,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo,
SelectImplicitDestDestTargets(spellEffectInfo, targetType);
break;
default:
ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_DEST");
ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_DEST");
break;
}
break;
@@ -933,7 +933,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo,
SelectImplicitTargetObjectTargets(spellEffectInfo, targetType);
break;
default:
ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT");
ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT");
break;
}
break;
@@ -943,7 +943,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo,
TC_LOG_DEBUG("spells", "SPELL: target type %u, found in spellID %u, effect %u is not implemented yet!", m_spellInfo->Id, uint32(spellEffectInfo.EffectIndex), targetType.GetTarget());
break;
default:
ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target category");
ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target category");
break;
}
}
@@ -952,7 +952,7 @@ void Spell::SelectImplicitChannelTargets(SpellEffectInfo const& spellEffectInfo,
{
if (targetType.GetReferenceType() != TARGET_REFERENCE_TYPE_CASTER)
{
ASSERT(false && "Spell::SelectImplicitChannelTargets: received not implemented target reference type");
ABORT_MSG("Spell::SelectImplicitChannelTargets: received not implemented target reference type");
return;
}
@@ -1008,7 +1008,7 @@ void Spell::SelectImplicitChannelTargets(SpellEffectInfo const& spellEffectInfo,
break;
}
default:
ASSERT(false && "Spell::SelectImplicitChannelTargets: received not implemented target type");
ABORT_MSG("Spell::SelectImplicitChannelTargets: received not implemented target type");
break;
}
}
@@ -1017,7 +1017,7 @@ void Spell::SelectImplicitNearbyTargets(SpellEffectInfo const& spellEffectInfo,
{
if (targetType.GetReferenceType() != TARGET_REFERENCE_TYPE_CASTER)
{
ASSERT(false && "Spell::SelectImplicitNearbyTargets: received not implemented target reference type");
ABORT_MSG("Spell::SelectImplicitNearbyTargets: received not implemented target reference type");
return;
}
@@ -1038,7 +1038,7 @@ void Spell::SelectImplicitNearbyTargets(SpellEffectInfo const& spellEffectInfo,
range = m_spellInfo->GetMaxRange(IsPositive(), m_caster, this);
break;
default:
ASSERT(false && "Spell::SelectImplicitNearbyTargets: received not implemented selection check type");
ABORT_MSG("Spell::SelectImplicitNearbyTargets: received not implemented selection check type");
break;
}
@@ -1135,7 +1135,7 @@ void Spell::SelectImplicitNearbyTargets(SpellEffectInfo const& spellEffectInfo,
break;
}
default:
ASSERT(false && "Spell::SelectImplicitNearbyTargets: received not implemented target object type");
ABORT_MSG("Spell::SelectImplicitNearbyTargets: received not implemented target object type");
break;
}
@@ -1228,7 +1228,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffectInfo const& spellEffectInfo, Sp
break;
}
default:
ASSERT(false && "Spell::SelectImplicitAreaTargets: received not implemented target reference type");
ABORT_MSG("Spell::SelectImplicitAreaTargets: received not implemented target reference type");
return;
}
@@ -1250,7 +1250,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffectInfo const& spellEffectInfo, Sp
center = referer;
break;
default:
ASSERT(false && "Spell::SelectImplicitAreaTargets: received not implemented target reference type");
ABORT_MSG("Spell::SelectImplicitAreaTargets: received not implemented target reference type");
return;
}
@@ -1784,7 +1784,7 @@ void Spell::SelectImplicitLineTargets(SpellEffectInfo const& spellEffectInfo, Sp
dst = m_targets.GetUnitTarget();
break;
default:
ASSERT(false, "Spell::SelectImplicitLineTargets: received not implemented target reference type");
ABORT_MSG("Spell::SelectImplicitLineTargets: received not implemented target reference type");
return;
}
src/server/game/Spells/SpellScript.cpp
+1 -1
View File
@@ -1125,7 +1125,7 @@ bool AuraScript::_IsDefaultActionPrevented() const
case AURA_SCRIPT_HOOK_EFFECT_PROC:
return m_defaultActionPrevented;
default:
ASSERT(false && "AuraScript::_IsDefaultActionPrevented is called in a wrong place");
ABORT_MSG("AuraScript::_IsDefaultActionPrevented is called in a wrong place");
return false;
}
}
src/server/shared/DataStores/DB2DatabaseLoader.cpp
+2 -2
View File
@@ -167,7 +167,7 @@ char* DB2DatabaseLoader::Load(bool custom, uint32& records, char**& indexTable,
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[f], _storageName.c_str(), _loadInfo->Fields[f].Name);
break;
}
@@ -274,7 +274,7 @@ void DB2DatabaseLoader::LoadStrings(bool custom, LocaleConstant locale, uint32 r
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], _storageName.c_str(), _loadInfo->Fields[fieldIndex].Name);
break;
}
src/tools/vmap4_extractor/gameobject_extract.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ void ExtractGameobjectModels()
else if (!memcmp(&header, "MD20", 4) || !memcmp(&header, "MD21", 4))
result = ExtractSingleModel(fileName);
else
ASSERT(false, "%s header: %d - %c%c%c%c", fileName.c_str(), header, (header >> 24) & 0xFF, (header >> 16) & 0xFF, (header >> 8) & 0xFF, header & 0xFF);
ABORT_MSG("%s header: %d - %c%c%c%c", fileName.c_str(), header, (header >> 24) & 0xFF, (header >> 16) & 0xFF, (header >> 8) & 0xFF, header & 0xFF);
if (result)
{