diff options
author | Shauren <shauren.trinity@gmail.com> | 2021-10-01 11:18:29 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-10-06 10:34:20 +0200 |
commit | c029f21f3429ab12678e1497614dc7a086fc1703 (patch) | |
tree | 3311eb568209728c6665f779115a5390d8c957de /src | |
parent | a462daa01c6b966821fadbd64b881020067cf6bd (diff) |
Core/Misc: Fix appleclang 12 warnings
(cherry picked from commit 3bf6698116d6d683947ccd23f21bba933dc59a2e)
# Conflicts:
# src/server/game/Handlers/BlackMarketHandler.cpp
# src/server/game/Loot/LootItemStorage.cpp
# src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
# src/server/shared/DataStores/DB2DatabaseLoader.cpp
Diffstat (limited to 'src')
7 files changed, 17 insertions, 17 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 82fb8355ac7..0f1260bf1fc 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -597,7 +597,7 @@ void BossAI::_DespawnAtEvade(Seconds delayToRespawn /*= 30s*/, Creature* who /*= { if (delayToRespawn < 2s) { - TC_LOG_ERROR("scripts.ai", "BossAI::_DespawnAtEvade: called with delay of %ld seconds, defaulting to 2 (me: %s)", delayToRespawn.count(), me->GetGUID().ToString().c_str()); + TC_LOG_ERROR("scripts.ai", "BossAI::_DespawnAtEvade: called with delay of " UI64FMTD " seconds, defaulting to 2 (me: %s)", delayToRespawn.count(), me->GetGUID().ToString().c_str()); delayToRespawn = 2s; } diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index b18020b6e67..58dcc7e6607 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -4426,7 +4426,7 @@ void Map::SaveRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId, uin if (startup) { if (!success) - TC_LOG_ERROR("maps", "Attempt to load saved respawn %" PRIu64 " for (%u,%u) failed - duplicate respawn? Skipped.", respawnTime, uint32(type), spawnId); + TC_LOG_ERROR("maps", "Attempt to load saved respawn " UI64FMTD " for (%u,%u) failed - duplicate respawn? Skipped.", uint64(respawnTime), uint32(type), spawnId); } else if (success) SaveRespawnInfoDB(ri, dbTrans); @@ -4462,11 +4462,11 @@ void Map::LoadRespawnTimes() if (SpawnData const* data = sObjectMgr->GetSpawnData(type, spawnId)) SaveRespawnTime(type, spawnId, data->id, time_t(respawnTime), Trinity::ComputeGridCoord(data->spawnPoint.GetPositionX(), data->spawnPoint.GetPositionY()).GetId(), nullptr, true); else - TC_LOG_ERROR("maps", "Loading saved respawn time of %" PRIu64 " for spawnid (%u,%u) - spawn does not exist, ignoring", respawnTime, uint32(type), spawnId); + TC_LOG_ERROR("maps", "Loading saved respawn time of " UI64FMTD " for spawnid (%u,%u) - spawn does not exist, ignoring", uint64(respawnTime), uint32(type), spawnId); } else { - TC_LOG_ERROR("maps", "Loading saved respawn time of %" PRIu64 " for spawnid (%u,%u) - invalid spawn type, ignoring", respawnTime, uint32(type), spawnId); + TC_LOG_ERROR("maps", "Loading saved respawn time of " UI64FMTD " for spawnid (%u,%u) - invalid spawn type, ignoring", uint64(respawnTime), uint32(type), spawnId); } } while (result->NextRow()); diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index f2c9b9e90aa..099d885a781 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -665,7 +665,7 @@ void PoolMgr::LoadFromDB() // Now check for circular reference // All pool_ids are in pool_template - for (auto const it : mPoolTemplate) + for (auto const& it : mPoolTemplate) { std::set<uint32> checkedPools; for (SearchMap::iterator poolItr = mPoolSearchMap.find(it.first); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second)) diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 3e603bc6d44..ce023bbac81 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -435,7 +435,7 @@ inline bool ValidateFields(TableStruct const& ts, std::string const& str, size_t s = str.find("` (`"); if (s == std::string::npos) { - TC_LOG_ERROR("misc", "LoadPlayerDump: (line " UI64FMTD ") dump format not recognized.", lineNumber); + TC_LOG_ERROR("misc", "LoadPlayerDump: (line " SZFMTD ") dump format not recognized.", lineNumber); return false; } s += 4; @@ -444,7 +444,7 @@ inline bool ValidateFields(TableStruct const& ts, std::string const& str, size_t std::string::size_type e = str.find('`', s); if (e == std::string::npos || valPos == std::string::npos) { - TC_LOG_ERROR("misc", "LoadPlayerDump: (line " UI64FMTD ") unexpected end of line", lineNumber); + TC_LOG_ERROR("misc", "LoadPlayerDump: (line " SZFMTD ") unexpected end of line", lineNumber); return false; } @@ -454,7 +454,7 @@ inline bool ValidateFields(TableStruct const& ts, std::string const& str, size_t int32 columnIndex = GetColumnIndexByName(ts, column); if (columnIndex == -1) { - TC_LOG_ERROR("misc", "LoadPlayerDump: (line " UI64FMTD ") unknown column name `%s` for table `%s`, aborting due to incompatible DB structure.", lineNumber, column.c_str(), ts.TableName.c_str()); + TC_LOG_ERROR("misc", "LoadPlayerDump: (line " SZFMTD ") unknown column name `%s` for table `%s`, aborting due to incompatible DB structure.", lineNumber, column.c_str(), ts.TableName.c_str()); return false; } @@ -843,7 +843,7 @@ DumpReturn PlayerDumpReader::LoadDump(std::istream& input, uint32 account, std:: std::string tn = GetTableName(line); if (tn.empty()) { - TC_LOG_ERROR("misc", "LoadPlayerDump: (line " UI64FMTD ") Can't extract table name!", lineNumber); + TC_LOG_ERROR("misc", "LoadPlayerDump: (line " SZFMTD ") Can't extract table name!", lineNumber); return DUMP_FILE_BROKEN; } @@ -860,7 +860,7 @@ DumpReturn PlayerDumpReader::LoadDump(std::istream& input, uint32 account, std:: if (i == DUMP_TABLE_COUNT) { - TC_LOG_ERROR("misc", "LoadPlayerDump: (line " UI64FMTD ") Unknown table: `%s`!", lineNumber, tn.c_str()); + TC_LOG_ERROR("misc", "LoadPlayerDump: (line " SZFMTD ") Unknown table: `%s`!", lineNumber, tn.c_str()); return DUMP_FILE_BROKEN; } diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index c7aea3765f1..da1e85a2d6e 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -118,7 +118,7 @@ public: bool footer = false; std::shared_lock<std::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); - for (auto const [playerGuid, player] : ObjectAccessor::GetPlayers()) + for (auto const& [playerGuid, player] : ObjectAccessor::GetPlayers()) { AccountTypes playerSec = player->GetSession()->GetSecurity(); if ((player->IsGameMaster() || diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index df6fb16f063..0f0767189c7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -416,7 +416,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } break; case DATA_DESPAWN_SNOBOLDS: - for (ObjectGuid const guid : snoboldGUIDS) + for (ObjectGuid guid : snoboldGUIDS) if (Creature* snobold = instance->GetCreature(guid)) snobold->DespawnOrUnsummon(); snoboldGUIDS.clear(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 7629f2f43b4..0480ffc9340 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -228,7 +228,7 @@ struct boss_shade_of_akama : public BossAI events.Reset(); summons.DespawnAll(); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_DESPAWN_ALL_SPAWNS); @@ -260,7 +260,7 @@ struct boss_shade_of_akama : public BossAI me->SetWalk(false); events.ScheduleEvent(EVENT_ADD_THREAT, Milliseconds(100)); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_STOP_SPAWNING); } @@ -273,7 +273,7 @@ struct boss_shade_of_akama : public BossAI if (Creature* akama = instance->GetCreature(DATA_AKAMA_SHADE)) akama->AI()->DoAction(ACTION_SHADE_OF_AKAMA_DEAD); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_DESPAWN_ALL_SPAWNS); @@ -315,11 +315,11 @@ struct boss_shade_of_akama : public BossAI } case EVENT_START_CHANNELERS_AND_SPAWNERS: { - for (ObjectGuid const summonGuid : summons) + for (ObjectGuid summonGuid : summons) if (Creature* channeler = ObjectAccessor::GetCreature(*me, summonGuid)) channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_START_SPAWNING); |