aboutsummaryrefslogtreecommitdiff
path: root/src/game/GameEventMgr.cpp
diff options
context:
space:
mode:
authormaximius <none@none>2009-10-27 23:35:44 -0700
committermaximius <none@none>2009-10-27 23:35:44 -0700
commit6f097c724cc5e135db92879a48d385000c755d7a (patch)
treea54b84f5d7d56d954999ea78e55c24a55ee5c991 /src/game/GameEventMgr.cpp
parentb243cf3228ddbbd15fe2bb8f5434bd45ce7c303e (diff)
*Fix build
--HG-- branch : trunk
Diffstat (limited to 'src/game/GameEventMgr.cpp')
-rw-r--r--src/game/GameEventMgr.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index 640442bf052..3d19b8197cb 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -1645,14 +1645,20 @@ void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id)
}
}
-TRINITY_DLL_SPEC bool IsHolidayActive( HolidayIds id )
+TRINITY_DLL_SPEC bool IsHolidayActive(HolidayIds id)
{
GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
GameEventMgr::ActiveEvents const& ae = gameeventmgr.GetActiveEventList();
for (GameEventMgr::ActiveEvents::const_iterator itr = ae.begin(); itr != ae.end(); ++itr)
- if(events[*itr].holiday_id==id)
+ if(events[*itr].holiday_id == id)
return true;
return false;
}
+
+TRINITY_DLL_SPEC bool IsEventActive(uint16 event_id)
+{
+ GameEventMgr::ActiveEvents const& ae = gameeventmgr.GetActiveEventList();
+ return ae.find(event_id) != ae.end();
+}