diff options
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
-rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index f06b1d520b2..8ed647ca364 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -408,7 +408,7 @@ void GameEventMgr::LoadFromDB() int32 internal_event_id = mGameEvent.size() + event_id - 1; - if (internal_event_id < 0 || internal_event_id >= mGameEventCreatureGuids.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventCreatureGuids.size())) { sLog.outErrorDb("`game_event_creature` game event id (%i) is out of range compared to max event id in `game_event`",event_id); continue; @@ -457,7 +457,7 @@ void GameEventMgr::LoadFromDB() int32 internal_event_id = mGameEvent.size() + event_id - 1; - if (internal_event_id < 0 || internal_event_id >= mGameEventGameobjectGuids.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventGameobjectGuids.size())) { sLog.outErrorDb("`game_event_gameobject` game event id (%i) is out of range compared to max event id in `game_event`",event_id); continue; @@ -1009,7 +1009,7 @@ void GameEventMgr::LoadFromDB() int32 internal_event_id = mGameEvent.size() + event_id - 1; - if (internal_event_id < 0 || internal_event_id >= mGameEventPoolIds.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventPoolIds.size())) { sLog.outErrorDb("`game_event_pool` game event id (%i) is out of range compared to max event id in `game_event`",event_id); continue; @@ -1253,9 +1253,10 @@ void GameEventMgr::GameEventSpawn(int16 event_id) { int32 internal_event_id = mGameEvent.size() + event_id - 1; - if (internal_event_id < 0 || internal_event_id >= mGameEventCreatureGuids.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventCreatureGuids.size())) { - sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventCreatureGuids.size()); + sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")", + internal_event_id, mGameEventCreatureGuids.size()); return; } @@ -1281,9 +1282,10 @@ void GameEventMgr::GameEventSpawn(int16 event_id) } } - if (internal_event_id < 0 || internal_event_id >= mGameEventGameobjectGuids.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventGameobjectGuids.size())) { - sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventGameobjectGuids.size()); + sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")", + internal_event_id, mGameEventGameobjectGuids.size()); return; } @@ -1312,9 +1314,10 @@ void GameEventMgr::GameEventSpawn(int16 event_id) } } - if (internal_event_id < 0 || internal_event_id >= mGameEventPoolIds.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventPoolIds.size())) { - sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventPoolIds element %u (size: " SIZEFMTD ")",internal_event_id,mGameEventPoolIds.size()); + sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventPoolIds element %u (size: " SIZEFMTD ")", + internal_event_id, mGameEventPoolIds.size()); return; } @@ -1326,9 +1329,10 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) { int32 internal_event_id = mGameEvent.size() + event_id - 1; - if (internal_event_id < 0 || internal_event_id >= mGameEventCreatureGuids.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventCreatureGuids.size())) { - sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventCreatureGuids.size()); + sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")", + internal_event_id, mGameEventCreatureGuids.size()); return; } @@ -1347,9 +1351,10 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) } } - if (internal_event_id < 0 || internal_event_id >= mGameEventGameobjectGuids.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventGameobjectGuids.size())) { - sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventGameobjectGuids.size()); + sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")", + internal_event_id, mGameEventGameobjectGuids.size()); return; } @@ -1367,7 +1372,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id) pGameobject->AddObjectToRemoveList(); } } - if (internal_event_id < 0 || internal_event_id >= mGameEventPoolIds.size()) + if (internal_event_id < 0 || internal_event_id >= int32(mGameEventPoolIds.size())) { sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventPoolIds element %u (size: " SIZEFMTD ")",internal_event_id,mGameEventPoolIds.size()); return; |