[11963] Add additional check for game_events, invalid occurence

Signed-off-by: Schmoozerd <[email protected]>
minorityee · Apr 15, 2012 · 641e7ce · 641e7ce
1 parent b71a244
commit 641e7ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
@@ -146,17 +146,23 @@ void GameEventMgr::LoadFromDB()
             pGameEvent.holiday_id   = HolidayIds(fields[5].GetUInt32());
 
 
-            if(pGameEvent.length==0)                            // length>0 is validity check
+            if (pGameEvent.length == 0)                     // length>0 is validity check
             {
-                sLog.outErrorDb("`game_event` game event id (%i) have length 0 and can't be used.",event_id);
+                sLog.outErrorDb("`game_event` game event id (%i) have length 0 and can't be used.", event_id);
                 continue;
             }
 
-            if(pGameEvent.holiday_id != HOLIDAY_NONE)
+            if (pGameEvent.occurence < pGameEvent.length)   // occurence < length is useless. This also asserts that occurence > 0!
             {
-                if(!sHolidaysStore.LookupEntry(pGameEvent.holiday_id))
+                sLog.outErrorDb("`game_event` game event id (%i) has occurence %u  < length %u and can't be used.", event_id, pGameEvent.occurence, pGameEvent.length);
+                continue;
+            }
+
+            if (pGameEvent.holiday_id != HOLIDAY_NONE)
+            {
+                if (!sHolidaysStore.LookupEntry(pGameEvent.holiday_id))
                 {
-                    sLog.outErrorDb("`game_event` game event id (%i) have nonexistent holiday id %u.",event_id,pGameEvent.holiday_id);
+                    sLog.outErrorDb("`game_event` game event id (%i) have nonexistent holiday id %u.", event_id, pGameEvent.holiday_id);
                     pGameEvent.holiday_id = HOLIDAY_NONE;
                 }
             }

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11962"
+ #define REVISION_NR "11963"
 #endif // __REVISION_NR_H__