From df77b5f4f79dfee4dee4f01e7258e1b4e7c1b7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=B9=BF?= Date: Mon, 24 Apr 2023 19:13:07 +0800 Subject: [PATCH] chore(core): cleanup code p3 (#16073) * Update MMapMgr.cpp * Update UpdateFetcher.cpp * Update AuctionHouseMgr.cpp * Update AuctionHouseMgr.h * Update BattlegroundAV.cpp * Update ChannelMgr.cpp * Update ThreatMgr.h * Update Player.h * Update PlayerSettings.cpp * Update ObjectMgr.cpp * Update Guild.cpp * Update Guild.h * Update Map.cpp * Update World.cpp * Update boss_nefarian.cpp * Update boss_prince_malchezaar.cpp * Update boss_venoxis.cpp * Update zone_elwynn_forest.cpp * Update zulfarrak.cpp * Update boss_novos.cpp --- src/common/Collision/Management/MMapMgr.cpp | 2 +- src/server/database/Updater/UpdateFetcher.cpp | 2 +- src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 4 ++-- src/server/game/AuctionHouse/AuctionHouseMgr.h | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp | 2 +- src/server/game/Chat/Channels/ChannelMgr.cpp | 2 +- src/server/game/Combat/ThreatMgr.h | 2 +- src/server/game/Entities/Player/Player.h | 2 +- src/server/game/Entities/Player/PlayerSettings.cpp | 6 +++--- src/server/game/Globals/ObjectMgr.cpp | 4 ++-- src/server/game/Guilds/Guild.cpp | 4 ++-- src/server/game/Guilds/Guild.h | 2 +- src/server/game/Maps/Map.cpp | 2 +- src/server/game/World/World.cpp | 2 +- .../BlackrockMountain/BlackwingLair/boss_nefarian.cpp | 2 +- .../EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp | 2 +- .../scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp | 2 +- src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp | 4 ++-- src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 2 +- src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/common/Collision/Management/MMapMgr.cpp b/src/common/Collision/Management/MMapMgr.cpp index e1e64ac9f..622220c5a 100644 --- a/src/common/Collision/Management/MMapMgr.cpp +++ b/src/common/Collision/Management/MMapMgr.cpp @@ -253,7 +253,7 @@ namespace MMAP // unload all tiles from given map MMapData* mmap = itr->second; - for (auto i : mmap->loadedTileRefs) + for (auto& i : mmap->loadedTileRefs) { uint32 x = (i.first >> 16); uint32 y = (i.first & 0x0000FFFF); diff --git a/src/server/database/Updater/UpdateFetcher.cpp b/src/server/database/Updater/UpdateFetcher.cpp index 97811954d..3e128ebb5 100644 --- a/src/server/database/Updater/UpdateFetcher.cpp +++ b/src/server/database/Updater/UpdateFetcher.cpp @@ -252,7 +252,7 @@ UpdateResult UpdateFetcher::Update(bool const redundancyChecks, // Fill hash to name cache HashToFileNameStorage hashToName; - for (auto entry : applied) + for (auto& entry : applied) hashToName.insert(std::make_pair(entry.second.hash, entry.first)); size_t importedUpdates = 0; diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 540158b39..3fd3a373b 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -37,7 +37,7 @@ constexpr auto AH_MINIMUM_DEPOSIT = 100; // Proof of concept, we should shift the info we're obtaining in here into AuctionEntry probably static bool SortAuction(AuctionEntry* left, AuctionEntry* right, AuctionSortOrderVector& sortOrder, Player* player, bool checkMinBidBuyout) { - for (auto thisOrder : sortOrder) + for (auto& thisOrder : sortOrder) { switch (thisOrder.sortOrder) { @@ -908,7 +908,7 @@ bool AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player } } - for (auto auction : auctionShortlist) + for (auto& auction : auctionShortlist) { // Add the item if no search term or if entered search term was found if (count < 50 && totalcount >= listfrom) diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index 829aa3c45..7c8fa5a46 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -133,7 +133,7 @@ public: AuctionHouseObject() { _next = _auctionsMap.begin(); } ~AuctionHouseObject() { - for (auto & itr : _auctionsMap) + for (auto& itr : _auctionsMap) delete itr.second; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index 114b7d3c9..c445ce958 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -1579,7 +1579,7 @@ void BattlegroundAV::ResetBGSubclass() bool BattlegroundAV::IsBothMinesControlledByTeam(TeamId teamId) const { - for (auto mine : m_Mine_Owner) + for (auto& mine : m_Mine_Owner) if (mine != teamId) return false; diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp index bd1f0a952..0e74a451a 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.cpp +++ b/src/server/game/Chat/Channels/ChannelMgr.cpp @@ -106,7 +106,7 @@ void ChannelMgr::LoadChannels() ++count; } while (result->NextRow()); - for (auto pair : toDelete) + for (auto& pair : toDelete) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHANNEL); stmt->SetData(0, pair.first); diff --git a/src/server/game/Combat/ThreatMgr.h b/src/server/game/Combat/ThreatMgr.h index 846a1fd28..bcc6d1614 100644 --- a/src/server/game/Combat/ThreatMgr.h +++ b/src/server/game/Combat/ThreatMgr.h @@ -259,7 +259,7 @@ public: if (threatList.empty()) return; - for (auto ref : threatList) + for (auto& ref : threatList) { if (predicate(ref->getTarget())) { diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 98c256426..ead737bce 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1801,7 +1801,7 @@ public: { Unit::SetPvP(state); if (!m_Controlled.empty()) - for (auto itr : m_Controlled) + for (auto& itr : m_Controlled) itr->SetPvP(state); } void UpdatePvP(bool state, bool _override = false); diff --git a/src/server/game/Entities/Player/PlayerSettings.cpp b/src/server/game/Entities/Player/PlayerSettings.cpp index 19f161987..7e45d03db 100644 --- a/src/server/game/Entities/Player/PlayerSettings.cpp +++ b/src/server/game/Entities/Player/PlayerSettings.cpp @@ -48,7 +48,7 @@ void Player::_LoadCharacterSettings(PreparedQueryResult result) uint32 count = 0; - for (auto token : tokens) + for (auto& token : tokens) { if (token.empty()) { @@ -95,11 +95,11 @@ void Player::_SavePlayerSettings(CharacterDatabaseTransaction trans) return; } - for (auto itr : m_charSettingsMap) + for (auto& itr : m_charSettingsMap) { std::ostringstream data; - for (auto setting : itr.second) + for (auto& setting : itr.second) { data << setting.value << ' '; } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 5f1221fec..e3176547d 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -948,7 +948,7 @@ void ObjectMgr::LoadCreatureCustomIDs() std::string stringCreatureIds = sConfigMgr->GetOption("Creatures.CustomIDs", ""); std::vector CustomCreatures = Acore::Tokenize(stringCreatureIds, ',', false); - for (auto itr : CustomCreatures) + for (auto& itr : CustomCreatures) { _creatureCustomIDsStore.push_back(Acore::StringTo(itr).value()); } @@ -1296,7 +1296,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) const_cast(cInfo)->DamageModifier *= Creature::_GetDamageMod(cInfo->rank); // Hack for modules - for (auto itr : _creatureCustomIDsStore) + for (auto& itr : _creatureCustomIDsStore) { if (cInfo->Entry == itr) return; diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index aabe0c9c6..85344f670 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1388,7 +1388,7 @@ void Guild::HandleSetRankInfo(WorldSession* session, uint8 rankId, std::string_v rankInfo->SetRights(rights); _SetRankBankMoneyPerDay(rankId, moneyPerDay); - for (auto rightsAndSlot : rightsAndSlots) + for (auto& rightsAndSlot : rightsAndSlots) _SetRankBankTabRightsAndSlots(rankId, rightsAndSlot); _BroadcastEvent(GE_RANK_UPDATED, ObjectGuid::Empty, std::to_string(rankId), rankInfo->GetName(), std::to_string(m_ranks.size())); @@ -2382,7 +2382,7 @@ void Guild::_CreateNewBankTab() trans->Append(stmt); ++tabId; - for (auto & m_rank : m_ranks) + for (auto& m_rank : m_ranks) m_rank.CreateMissingTabsIfNeeded(tabId, trans, false); CharacterDatabase.CommitTransaction(trans); diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index a4d873235..3ed7e10cc 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -393,7 +393,7 @@ public: // pussywizard: public class Member } inline Member* GetMember(std::string_view name) { - for (auto & m_member : m_members) + for (auto& m_member : m_members) if (m_member.second.GetName() == name) return &m_member.second; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 0b7520676..26c35ffdf 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3820,7 +3820,7 @@ void Map::DoForAllPlayers(std::function exec) bool Map::CanReachPositionAndGetValidCoords(WorldObject const* source, PathGenerator *path, float &destX, float &destY, float &destZ, bool failOnCollision, bool failOnSlopes) const { G3D::Vector3 prevPath = path->GetStartPosition(); - for (auto & vector : path->GetPath()) + for (auto& vector : path->GetPath()) { float x = vector.x; float y = vector.y; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index ca0b3c206..61fe44ddb 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1560,7 +1560,7 @@ void World::SetInitialWorldSettings() sIPLocation->Load(); std::vector mapIds; - for (auto const map : sMapStore) + for (auto const& map : sMapStore) { mapIds.emplace_back(map->MapID); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index e50e27af6..8ebc9569b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -1243,7 +1243,7 @@ class spell_shadowblink : public SpellScript return; } - for (auto itr : spellPos) + for (auto& itr : spellPos) { float distTarget = target->GetDistance2d(itr.second.m_positionX, itr.second.m_positionY); if (distTarget <= 30.f) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 5d9e76d65..439451504 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -248,7 +248,7 @@ struct boss_malchezaar : public BossAI void EnfeebleResetHealth() { - for (auto targets : _enfeebleTargets) + for (auto& targets : _enfeebleTargets) { if (Unit* target = ObjectAccessor::GetUnit(*me, targets.first)) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index eea96fa24..339ce76d9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -131,7 +131,7 @@ public: if (!cobraList.empty()) { - for (auto cobras : cobraList) + for (auto& cobras : cobraList) { cobras->SetInCombatWithZone(); } diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp index 97d60a032..4936c6b39 100644 --- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp @@ -101,7 +101,7 @@ struct npc_cameron : public ScriptedAI Acore::Containers::RandomShuffle(MovePosPositions); // first we break formation because children will need to move on their own now - for (auto guid : _childrenGUIDs) + for (auto& guid : _childrenGUIDs) if (Creature* child = ObjectAccessor::GetCreature(*me, guid)) if (child->GetFormation()) child->GetFormation()->RemoveMember(child); @@ -228,7 +228,7 @@ struct npc_cameron : public ScriptedAI // If Formation was disbanded, remake. if (!me->GetFormation()->IsFormed()) - for (auto guid : _childrenGUIDs) + for (auto& guid : _childrenGUIDs) if (Creature* child = ObjectAccessor::GetCreature(*me, guid)) child->SearchFormation(); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 608b9446b..ce7a3af22 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -573,7 +573,7 @@ public: if (_summonAddsTimer <= diff) { - for (auto itr : shadowpriestSezzizAdds[_summmonAddsCount]) + for (auto& itr : shadowpriestSezzizAdds[_summmonAddsCount]) { if (Creature* add = me->SummonCreature(itr.first, itr.second, TEMPSUMMON_DEAD_DESPAWN, 10 * IN_MILLISECONDS)) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 8d63edb50..7a7cabec9 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -132,7 +132,7 @@ public: me->CastSpell(me, SPELL_ARCANE_FIELD, true); me->CastSpell(me, SPELL_DESPAWN_CRYSTAL_HANDLER, true); - for (auto itr : npcSummon) + for (auto& itr : npcSummon) { uint32 summonEntry; Position summonPos;