diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-09-11 17:04:14 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-09-11 17:04:14 +0200 |
| commit | cf2602ba631b42943e9eac67b6b6c1625ea6d01f (patch) | |
| tree | fe1c3bcc93d0d482168ac25ff8bfab9f5251a04c /src/server/game/Entities/Object | |
| parent | fb1f98ad090b63ea1fad390e42896b78e43fd804 (diff) | |
Core/Movement: Changed movement flags2 to uint32
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 12 |
1 files changed, 6 insertions, 6 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; } |