diff options
author | Shauren <shauren.trinity@gmail.com> | 2015-03-08 22:04:34 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2015-03-08 22:04:34 +0100 |
commit | e15ba34444b4484cebbe2070e0f205ccf9c69a16 (patch) | |
tree | 47560de814f2112b3adc6162bc7ac0559608b5fc /src/server/game/Globals/ObjectMgr.cpp | |
parent | 75f0cabde74ed491bfe1545d2291f6ce28993ccf (diff) |
Core/Misc: Cleaned up data truncation warnings
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index df7a3a65dd8..2523f316cec 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4970,14 +4970,14 @@ void ObjectMgr::LoadInstanceEncounters() { if (GetMapDifficultyData(dungeonEncounter->MapID, Difficulty(i))) { - DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->MapID, i)]; + DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR64(dungeonEncounter->MapID, i)]; encounters.push_back(new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon)); } } } else { - DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR32(dungeonEncounter->MapID, dungeonEncounter->DifficultyID)]; + DungeonEncounterList& encounters = _dungeonEncounterStore[MAKE_PAIR64(dungeonEncounter->MapID, dungeonEncounter->DifficultyID)]; encounters.push_back(new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon)); } @@ -5843,7 +5843,7 @@ void ObjectMgr::LoadAccessRequirements() uint32 mapid = fields[0].GetUInt32(); uint8 difficulty = fields[1].GetUInt8(); - uint32 requirement_ID = MAKE_PAIR32(mapid, difficulty); + uint32 requirement_ID = MAKE_PAIR64(mapid, difficulty); AccessRequirement* ar = new AccessRequirement(); ar->levelMin = fields[2].GetUInt8(); |