diff options
| author | Machiavelli <none@none> | 2009-06-11 17:56:20 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-11 17:56:20 +0200 |
| commit | 1c97b2bf796fb367b77e653556220e69cf7b5878 (patch) | |
| tree | ffaa612c7502785edc750a664ebc2253c41e4f5c /src/game/Object.h | |
| parent | 6eaf6e962a31aa308406289d538aef30a56b95cb (diff) | |
| parent | 6c069aa5b8405d51202781104daf5c6e8642b891 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.h')
| -rw-r--r-- | src/game/Object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Object.h b/src/game/Object.h index 0e08247aece..037bb94aede 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -330,13 +330,13 @@ class TRINITY_DLL_SPEC Object virtual void _SetUpdateBits(UpdateMask *updateMask, Player *target) const; virtual void _SetCreateBits(UpdateMask *updateMask, Player *target) const; - void _BuildMovementUpdate(ByteBuffer * data, uint8 flags) const; + void _BuildMovementUpdate(ByteBuffer * data, uint16 flags) const; void _BuildValuesUpdate(uint8 updatetype, ByteBuffer *data, UpdateMask *updateMask, Player *target ) const; uint16 m_objectType; uint8 m_objectTypeId; - uint8 m_updateFlag; + uint16 m_updateFlag; union { |