From b64c5043140dc7b7908e259e441de16cc0261320 Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 17 Jan 2018 02:17:49 -0300 Subject: Core/Globals: throw some RAII into ObjectMgr, and load templates into vectors Ref #14274 --- src/server/game/Instances/InstanceScript.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/server/game/Instances/InstanceScript.cpp') diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index fa14e3246d8..341e75b1402 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -698,9 +698,8 @@ void InstanceScript::UpdateEncounterState(EncounterCreditType type, uint32 credi uint32 dungeonId = 0; - for (DungeonEncounterList::const_iterator itr = encounters->begin(); itr != encounters->end(); ++itr) + for (auto const& encounter : *encounters) { - DungeonEncounter const* encounter = *itr; if (encounter->creditType == type && encounter->creditEntry == creditEntry) { completedEncounters |= 1 << encounter->dbcEntry->encounterIndex; @@ -716,15 +715,19 @@ void InstanceScript::UpdateEncounterState(EncounterCreditType type, uint32 credi if (dungeonId) { Map::PlayerList const& players = instance->GetPlayers(); - for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) + for (auto const& ref : players) { - if (Player* player = i->GetSource()) + if (Player* player = ref.GetSource()) + { if (Group* grp = player->GetGroup()) + { if (grp->isLFGGroup()) { sLFGMgr->FinishDungeon(grp->GetGUID(), dungeonId, instance); return; } + } + } } } } -- cgit v1.2.3