From 3bc3b3eeeb78fa8acc559730f9c45b0f237e4b2b Mon Sep 17 00:00:00 2001 From: ariel- Date: Thu, 18 Jan 2018 00:53:45 -0300 Subject: Core/Globals: revert back to unordered_map for templates Partial revert of commit b64c5043140dc7b7908e259e441de16cc0261320 See discussion on https://github.com/TrinityCore/TrinityCore/commit/b64c5043140dc7b7908e259e441de16cc0261320 (cherry picked from commit b75ff7d4bf13fb4778843c99521223becc096ca0) --- src/server/game/Instances/InstanceScript.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 0a4c3a42cda..d802a96b01d 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -772,14 +772,14 @@ void InstanceScript::UpdateEncounterState(EncounterCreditType type, uint32 credi for (auto const& encounter : *encounters) { - if (encounter->creditType == type && encounter->creditEntry == creditEntry) + if (encounter.creditType == type && encounter.creditEntry == creditEntry) { - completedEncounters |= 1 << encounter->dbcEntry->Bit; - if (encounter->lastEncounterDungeon) + completedEncounters |= 1 << encounter.dbcEntry->Bit; + if (encounter.lastEncounterDungeon) { - dungeonId = encounter->lastEncounterDungeon; + dungeonId = encounter.lastEncounterDungeon; TC_LOG_DEBUG("lfg", "UpdateEncounterState: Instance %s (instanceId %u) completed encounter %s. Credit Dungeon: %u", - instance->GetMapName(), instance->GetInstanceId(), encounter->dbcEntry->Name[sWorld->GetDefaultDbcLocale()], dungeonId); + instance->GetMapName(), instance->GetInstanceId(), encounter.dbcEntry->Name[sWorld->GetDefaultDbcLocale()], dungeonId); break; } } -- cgit v1.2.3