aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Object
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2014-11-03 19:11:14 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2014-11-03 19:11:14 +0100
commit52bd9a771e2b94cec2491c97f418cc51d725d5b8 (patch)
treed380694d84c950cd5b8f8e440e1c68bb8f359aed /src/server/game/Entities/Object
parent064154c54018bb2c1657e4febf86ecc7c87b41e1 (diff)
Core/NetworkIO: implemented undelete opcodes and moved char create/delete packets to new packet classes
Diffstat (limited to 'src/server/game/Entities/Object')
-rw-r--r--src/server/game/Entities/Object/Object.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index ac3625ca3f4..8572d23bf64 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -359,17 +359,17 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const
bool EnablePortals = false;
bool PlayHoverAnim = false;
bool IsSuppressingGreetings = false;
- bool HasMovementUpdate = flags & UPDATEFLAG_LIVING ? true : false;
- bool HasMovementTransport = flags & UPDATEFLAG_TRANSPORT_POSITION ? true : false;
- bool Stationary = flags & UPDATEFLAG_STATIONARY_POSITION ? true : false;
- bool CombatVictim = flags & UPDATEFLAG_HAS_TARGET ? true : false;
- bool ServerTime = flags & UPDATEFLAG_TRANSPORT ? true : false;
- bool VehicleCreate = flags & UPDATEFLAG_VEHICLE ? true : false;
- bool AnimKitCreate = flags & UPDATEFLAG_ANIMKITS ? true : false;
- bool Rotation = flags & UPDATEFLAG_ROTATION ? true : false;
+ bool HasMovementUpdate = (flags & UPDATEFLAG_LIVING) != 0;
+ bool HasMovementTransport = (flags & UPDATEFLAG_TRANSPORT_POSITION) != 0;
+ bool Stationary = (flags & UPDATEFLAG_STATIONARY_POSITION) != 0;
+ bool CombatVictim = (flags & UPDATEFLAG_HAS_TARGET) != 0;
+ bool ServerTime = (flags & UPDATEFLAG_TRANSPORT) != 0;
+ bool VehicleCreate = (flags & UPDATEFLAG_VEHICLE) != 0;
+ bool AnimKitCreate = (flags & UPDATEFLAG_ANIMKITS) != 0;
+ bool Rotation = (flags & UPDATEFLAG_ROTATION) != 0;
bool HasAreaTrigger = false;
bool HasGameObject = false;
- bool ThisIsYou = flags & UPDATEFLAG_SELF ? true : false;
+ bool ThisIsYou = (flags & UPDATEFLAG_SELF) != 0;
bool ReplaceActive = false;
bool SceneObjCreate = false;
bool ScenePendingInstances = false;
@@ -379,7 +379,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const
PauseTimesCount = go->GetGOValue()->Transport.StopFrames->size();
data->WriteBit(NoBirthAnim);
- data->WriteBit(EnablePortals);
+ data->WriteBit(EnablePortals);
data->WriteBit(PlayHoverAnim);
data->WriteBit(IsSuppressingGreetings);
data->WriteBit(HasMovementUpdate);