aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/GameObject
diff options
context:
space:
mode:
authorVlad <vlad852@gmail.com>2013-07-19 04:03:40 +0100
committerNay <dnpd.dd@gmail.com>2013-07-19 04:03:40 +0100
commit0b9a8ccef5c4ae8971f097f464e4fbb31a38f279 (patch)
treea36d7dff43ebab528c41295c33f5e875fe66a2e2 /src/server/game/Entities/GameObject
parentebd9090d80df3494fe2b023110d402c5bb7a1460 (diff)
Core/Misc: Change creatures and gameobject phasemask from 16 to 32 bits
Signed-off-by: Nay <dnpd.dd@gmail.com>
Diffstat (limited to 'src/server/game/Entities/GameObject')
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Entities/GameObject/GameObject.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index f6fd332e6a4..0915d19cdfa 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -712,7 +712,7 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
stmt->setUInt32(index++, GetEntry());
stmt->setUInt16(index++, uint16(mapid));
stmt->setUInt8(index++, spawnMask);
- stmt->setUInt16(index++, uint16(GetPhaseMask()));
+ stmt->setUInt32(index++, GetPhaseMask());
stmt->setFloat(index++, GetPositionX());
stmt->setFloat(index++, GetPositionY());
stmt->setFloat(index++, GetPositionZ());
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index cf916afd6dc..3bddac81ee9 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -582,7 +582,7 @@ struct GameObjectData
explicit GameObjectData() : dbData(true) {}
uint32 id; // entry in gamobject_template
uint16 mapid;
- uint16 phaseMask;
+ uint32 phaseMask;
float posX;
float posY;
float posZ;