diff options
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 24 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateData.h | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 03a0602da38..7c8e163d170 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -350,7 +350,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const bool AnimKitCreate = (flags & UPDATEFLAG_ANIMKITS) != 0; bool Rotation = (flags & UPDATEFLAG_ROTATION) != 0; bool HasAreaTrigger = (flags & UPDATEFLAG_AREATRIGGER) != 0; - bool HasGameObject = false; + bool HasGameObject = (flags & UPDATEFLAG_GAMEOBJECT) != 0;; bool ThisIsYou = (flags & UPDATEFLAG_SELF) != 0; bool SmoothPhasing = false; bool SceneObjCreate = false; @@ -667,14 +667,20 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const } } - //if (HasGameObject) - //{ - // *data << uint32(WorldEffectID); - // data->WriteBit(bit8); - // data->FlushBits(); - // if (bit8) - // *data << uint32(Int1); - //} + if (HasGameObject) + { + bool bit8 = false; + uint32 Int1 = 0; + + GameObject const* gameObject = ToGameObject(); + + *data << uint32(gameObject->GetWorldEffectID()); + + data->WriteBit(bit8); + data->FlushBits(); + if (bit8) + *data << uint32(Int1); + } //if (SmoothPhasing) //{ diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index ca3bdcd4cce..b3d02b590bc 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -47,7 +47,7 @@ enum OBJECT_UPDATE_FLAGS UPDATEFLAG_ROTATION = 0x0080, UPDATEFLAG_ANIMKITS = 0x0100, UPDATEFLAG_AREATRIGGER = 0x0200, - //UPDATEFLAG_GAMEOBJECT = 0x0400, + UPDATEFLAG_GAMEOBJECT = 0x0400, //UPDATEFLAG_REPLACE_ACTIVE = 0x0800, //UPDATEFLAG_NO_BIRTH_ANIM = 0x1000, //UPDATEFLAG_ENABLE_PORTALS = 0x2000, |