aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.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/Globals/ObjectMgr.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/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 80dfedc357d..563e2056fd9 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1341,7 +1341,7 @@ void ObjectMgr::LoadCreatures()
data.spawnMask = fields[16].GetUInt8();
data.phaseMask = fields[17].GetUInt16();
int16 gameEvent = fields[18].GetInt16();
- int16 PoolId = fields[19].GetInt16();
+ int32 PoolId = fields[19].GetInt32();
MapEntry const* mapEntry = sMapStore.LookupEntry(data.mapid);
if (!mapEntry)
@@ -1725,7 +1725,7 @@ void ObjectMgr::LoadGameobjects()
data.phaseMask = fields[15].GetUInt16();
int16 gameEvent = fields[16].GetInt16();
- int16 PoolId = fields[17].GetInt16();
+ int32 PoolId = fields[17].GetInt32();
if (data.rotation2 < -1.0f || data.rotation2 > 1.0f)
{