aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Events/GameEventMgr.cpp
diff options
context:
space:
mode:
authorShocker <none@none>2010-08-26 06:49:31 +0300
committerShocker <none@none>2010-08-26 06:49:31 +0300
commit2748f86bdbbdaa039a82af18e062b307b1fd562f (patch)
treefd59d7f23aa492beed681696c2f799859ac1dbdb /src/server/game/Events/GameEventMgr.cpp
parentaa768001a766cc25d3944bb80a80e4deb6c2c429 (diff)
Fix crash when using a pool template with an entry > 65535, fixes issue #3632
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
-rw-r--r--src/server/game/Events/GameEventMgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 015f2eb1a2d..f06b1d520b2 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1004,7 +1004,7 @@ void GameEventMgr::LoadFromDB()
bar2.step();
- uint32 entry = fields[0].GetUInt16();
+ uint32 entry = fields[0].GetUInt32();
int16 event_id = fields[1].GetInt16();
int32 internal_event_id = mGameEvent.size() + event_id - 1;
@@ -1314,7 +1314,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
if (internal_event_id < 0 || internal_event_id >= mGameEventPoolIds.size())
{
- sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventPoolIds element %i (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;
}
@@ -1369,7 +1369,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
}
if (internal_event_id < 0 || internal_event_id >= mGameEventPoolIds.size())
{
- sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventPoolIds element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventPoolIds.size());
+ sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventPoolIds element %u (size: " SIZEFMTD ")",internal_event_id,mGameEventPoolIds.size());
return;
}