Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Globals: revert back to unordered_map for templates

Browse Source 
Partial revert of commit b64c504314
See discussion on b64c504314

(cherry picked from commit b75ff7d4bf)
This commit is contained in:
ariel-
2018-01-18 00:53:45 -03:00
committed by Shauren
parent 21556667c1
commit 3bc3b3eeeb
11 changed files with 182 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Instances/InstanceScript.cpp
View File

@@ -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;
}
}