diff options
| author | Ovahlord <dreadkiller@gmx.de> | 2020-07-07 13:56:16 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-21 22:09:06 +0100 |
| commit | 7a5529eb58daad9216416c9c632543b1a931ce1f (patch) | |
| tree | 57b17d1da4ef153cf33574c9f9110108a86117c5 /src/server/game/Events/GameEventMgr.h | |
| parent | 92e77e456a86900a673c927053c739ce4d0f4bc3 (diff) | |
Core/Events: refactored battleground holiday assignments.
Instead of going with shitty bitmasks we now accept plain battleground ids
instead
(cherry picked from commit 8a82403400ef49415e14530f4b55d55ef38bc74e)
Diffstat (limited to 'src/server/game/Events/GameEventMgr.h')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index b889394d848..ba13beb0b59 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -156,7 +156,7 @@ class TC_GAME_API GameEventMgr typedef std::pair<ObjectGuid::LowType /*guid*/, uint64 /*npcflag*/> GuidNPCFlagPair; typedef std::list<GuidNPCFlagPair> NPCFlagList; typedef std::vector<NPCFlagList> GameEventNPCFlagMap; - typedef std::vector<uint32> GameEventBitmask; + typedef std::vector<uint32> GameEventBattlegroundMap; GameEventQuestMap mGameEventCreatureQuests; GameEventQuestMap mGameEventGameObjectQuests; GameEventNPCVendorMap mGameEventVendors; @@ -165,7 +165,7 @@ class TC_GAME_API GameEventMgr //GameEventGuidMap mGameEventGameobjectGuids; GameEventIdMap mGameEventPoolIds; GameEventDataMap mGameEvent; - GameEventBitmask mGameEventBattlegroundHolidays; + GameEventBattlegroundMap mGameEventBattlegroundHolidays; QuestIdToEventConditionMap mQuestToEventConditions; GameEventNPCFlagMap mGameEventNPCFlags; ActiveEvents m_ActiveEvents; @@ -179,6 +179,6 @@ class TC_GAME_API GameEventMgr #define sGameEventMgr GameEventMgr::instance() TC_GAME_API bool IsHolidayActive(HolidayIds id); -TC_GAME_API bool IsEventActive(uint16 event_id); +TC_GAME_API bool IsEventActive(uint16 eventId); #endif |