aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2013-06-23 19:40:00 +0200
committerShauren <shauren.trinity@gmail.com>2013-06-23 19:40:00 +0200
commit9d9a92a56db2b22f61e54fdb33eb1f0954f218ab (patch)
treebf382d97d57151762550e1c66efcb048dbec66c0 /src/server/game/Globals/ObjectMgr.cpp
parentab1fa7b3ad65dcf3714f95af4ebd5a0eccac0794 (diff)
Core/Instances: Fixed loading DungeonEncounters.dbc (-1 means all difficulties), thx Northstrider for pointing it out
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 03b0cf90246..5d090d883db 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -5118,8 +5118,23 @@ void ObjectMgr::LoadInstanceEncounters()
continue;
}
- DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->mapId, dungeonEncounter->difficulty)];
- encounters.push_back(new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon));
+ if (dungeonEncounter->difficulty == -1)
+ {
+ for (uint32 i = 0; i < MAX_DIFFICULTY; ++i)
+ {
+ if (GetMapDifficultyData(dungeonEncounter->mapId, Difficulty(i)))
+ {
+ DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->mapId, i)];
+ encounters.push_back(new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon));
+ }
+ }
+ }
+ else
+ {
+ DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->mapId, dungeonEncounter->difficulty)];
+ encounters.push_back(new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon));
+ }
+
++count;
} while (result->NextRow());