From 405f312918136510fde921403ffffa315bdbcb4b Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 30 Aug 2010 15:25:15 +0200 Subject: Core: Fix more warnings --HG-- branch : trunk --- src/server/game/Events/GameEventMgr.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/server/game/Events/GameEventMgr.cpp') diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 8ed647ca364..d1d91f44354 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -79,7 +79,12 @@ uint32 GameEventMgr::NextCheck(uint16 entry) const // for CONDITIONS state world events, return the length of the wait period, so if the conditions are met, this check will be called again to set the timer as NEXTPHASE event if (mGameEvent[entry].state == GAMEEVENT_WORLD_CONDITIONS) - return mGameEvent[entry].length ? mGameEvent[entry].length * 60 : max_ge_check_delay; + { + if (mGameEvent[entry].length) + return mGameEvent[entry].length * 60 ; + else + return max_ge_check_delay; + } // outdated event: we return max if (currenttime > mGameEvent[entry].end) @@ -1710,7 +1715,7 @@ bool IsHolidayActive(HolidayIds id) GameEventMgr::ActiveEvents const& ae = sGameEventMgr.GetActiveEventList(); for (GameEventMgr::ActiveEvents::const_iterator itr = ae.begin(); itr != ae.end(); ++itr) - if (events[*itr].holiday_id == uint32(id)) + if (events[*itr].holiday_id == id) return true; return false; -- cgit v1.2.3