Fix crash when using a pool template with an entry > 65535, fixes issue #3632

--HG--
branch : trunk
This commit is contained in:
Shocker
2010-08-26 06:49:31 +03:00
parent aa768001a7
commit 2748f86bdb
8 changed files with 56 additions and 55 deletions
+2 -2
View File
@@ -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)
{