diff options
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 12 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 403c604f7b0..42d53ed2dc0 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -362,7 +362,7 @@ struct MovementInfo // common ObjectGuid guid; uint32 flags; - uint16 flags2; + uint32 flags2; Position pos; uint32 time; @@ -422,11 +422,11 @@ struct MovementInfo void RemoveMovementFlag(uint32 flag) { flags &= ~flag; } bool HasMovementFlag(uint32 flag) const { return (flags & flag) != 0; } - uint16 GetExtraMovementFlags() const { return flags2; } - void SetExtraMovementFlags(uint16 flag) { flags2 = flag; } - void AddExtraMovementFlag(uint16 flag) { flags2 |= flag; } - void RemoveExtraMovementFlag(uint16 flag) { flags2 &= ~flag; } - bool HasExtraMovementFlag(uint16 flag) const { return (flags2 & flag) != 0; } + uint32 GetExtraMovementFlags() const { return flags2; } + void SetExtraMovementFlags(uint32 flag) { flags2 = flag; } + void AddExtraMovementFlag(uint32 flag) { flags2 |= flag; } + void RemoveExtraMovementFlag(uint32 flag) { flags2 &= ~flag; } + bool HasExtraMovementFlag(uint32 flag) const { return (flags2 & flag) != 0; } uint32 GetFallTime() const { return jump.fallTime; } void SetFallTime(uint32 fallTime) { jump.fallTime = fallTime; } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 06ca24c6a65..41b8f767b2c 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -2140,11 +2140,11 @@ class TC_GAME_API Unit : public WorldObject uint32 GetUnitMovementFlags() const { return m_movementInfo.GetMovementFlags(); } void SetUnitMovementFlags(uint32 f) { m_movementInfo.SetMovementFlags(f); } - void AddExtraUnitMovementFlag(uint16 f) { m_movementInfo.AddExtraMovementFlag(f); } - void RemoveExtraUnitMovementFlag(uint16 f) { m_movementInfo.RemoveExtraMovementFlag(f); } - bool HasExtraUnitMovementFlag(uint16 f) const { return m_movementInfo.HasExtraMovementFlag(f); } - uint16 GetExtraUnitMovementFlags() const { return m_movementInfo.GetExtraMovementFlags(); } - void SetExtraUnitMovementFlags(uint16 f) { m_movementInfo.SetExtraMovementFlags(f); } + void AddExtraUnitMovementFlag(uint32 f) { m_movementInfo.AddExtraMovementFlag(f); } + void RemoveExtraUnitMovementFlag(uint32 f) { m_movementInfo.RemoveExtraMovementFlag(f); } + bool HasExtraUnitMovementFlag(uint32 f) const { return m_movementInfo.HasExtraMovementFlag(f); } + uint32 GetExtraUnitMovementFlags() const { return m_movementInfo.GetExtraMovementFlags(); } + void SetExtraUnitMovementFlags(uint32 f) { m_movementInfo.SetExtraMovementFlags(f); } bool IsSplineEnabled() const; float GetPositionZMinusOffset() const; |