diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
| commit | 13ec761ad2cc2aec24f850520f459bb124050a34 (patch) | |
| tree | d22b616621787ecdf81579ae08d3c46b93d471b3 /src/server/game/Events | |
| parent | 9a8cd0593c985a05dfc0fc9a45dd8d905974505b (diff) | |
| parent | d7b1405725d2f247776f3586df8c3512416f60cd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.h
Diffstat (limited to 'src/server/game/Events')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Events/GameEventMgr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 4404f8036af..175524d7208 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1621,7 +1621,7 @@ uint16 GameEventMgr::GetEventIdForQuest(Quest const* quest) const if (!quest) return 0; - UNORDERED_MAP<uint32, uint16>::const_iterator itr = _questToEventLinks.find(quest->GetQuestId()); + std::unordered_map<uint32, uint16>::const_iterator itr = _questToEventLinks.find(quest->GetQuestId()); if (itr == _questToEventLinks.end()) return 0; diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index b30ea8fc0ef..4b63402caa8 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -174,7 +174,7 @@ class GameEventMgr QuestIdToEventConditionMap mQuestToEventConditions; GameEventNPCFlagMap mGameEventNPCFlags; ActiveEvents m_ActiveEvents; - UNORDERED_MAP<uint32, uint16> _questToEventLinks; + std::unordered_map<uint32, uint16> _questToEventLinks; bool isSystemInit; public: GameEventGuidMap mGameEventCreatureGuids; |