diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
| commit | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (patch) | |
| tree | e40c2f50a9b5b11620ee607103f0352521bdf54f /src/server/game/Entities/Object | |
| parent | 1bea52fd4649b6a1761aa157f9e74f01e19872e7 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 38ad803d177..3e48b73cd60 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -53,7 +53,7 @@ #include "Battleground.h" #include "Chat.h" -Object::Object() : m_PackGUID(sizeof(uint64)+1) +Object::Object() { m_objectTypeId = TYPEID_OBJECT; m_objectType = TYPEMASK_OBJECT; @@ -375,7 +375,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const movementFlagsExtra = self->m_movementInfo.GetExtraMovementFlags(); hasSpline = self->IsSplineEnabled(); - hasTransportTime2 = self->m_movementInfo.transport.guid != 0 && self->m_movementInfo.transport.time2 != 0; + hasTransportTime2 = !self->m_movementInfo.transport.guid.IsEmpty() && self->m_movementInfo.transport.time2 != 0; hasTransportTime3 = false; hasPitch = self->HasUnitMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || self->HasExtraUnitMovementFlag(MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING); hasFallDirection = self->HasUnitMovementFlag(MOVEMENTFLAG_FALLING); @@ -853,7 +853,7 @@ void Object::SetUInt64Value(uint16 index, uint64 value) bool Object::AddGuidValue(uint16 index, ObjectGuid value) { ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); - if (value && !*((ObjectGuid*)&(m_uint32Values[index]))) + if (!value.IsEmpty() && ((ObjectGuid*)&(m_uint32Values[index]))->IsEmpty()) { *((ObjectGuid*)&(m_uint32Values[index])) = value; _changesMask.SetBit(index); @@ -874,7 +874,7 @@ bool Object::AddGuidValue(uint16 index, ObjectGuid value) bool Object::RemoveGuidValue(uint16 index, ObjectGuid value) { ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); - if (value && *((ObjectGuid*)&(m_uint32Values[index])) == value) + if (!value.IsEmpty() && *((ObjectGuid*)&(m_uint32Values[index])) == value) { m_uint32Values[index] = 0; m_uint32Values[index + 1] = 0; |