diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-20 13:27:04 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-20 13:27:04 +0200 |
| commit | e405ac5f4100cf9e544b80cf4503b107ecee8d50 (patch) | |
| tree | 155db121e093b757a215698639393841bbacb8f2 /src/server/game/Entities/Object | |
| parent | 420d096b6a477856979e2810a8f68d38cbce3349 (diff) | |
Fixed nopch build and some leftover warnings
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index d6157b43dde..36cc68b3ace 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -802,7 +802,7 @@ void Object::BuildDynamicValuesUpdate(uint8 updateType, ByteBuffer* data, Player { std::vector<uint32> const& values = _dynamicValues[index]; if (_fieldNotifyFlags & flags[index] || - ((updateType == UPDATETYPE_VALUES ? _dynamicChangesMask[index] : !values.empty()) && (flags[index] & visibleFlag))) + ((updateType == UPDATETYPE_VALUES ? _dynamicChangesMask[index] != UpdateMask::UNCHANGED : !values.empty()) && (flags[index] & visibleFlag))) { UpdateMask::SetUpdateBit(data->contents() + maskPos, index); @@ -837,7 +837,7 @@ void Object::AddToObjectUpdateIfNeeded() void Object::ClearUpdateMask(bool remove) { memset(_changesMask.data(), 0, _changesMask.size()); - memset(_dynamicChangesMask.data(), 0, _dynamicChangesMask.size()); + _dynamicChangesMask.assign(_dynamicChangesMask.size(), UpdateMask::UNCHANGED); for (uint32 i = 0; i < _dynamicValuesCount; ++i) memset(_dynamicChangesArrayMask[i].data(), 0, _dynamicChangesArrayMask[i].size()); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index b4cc81dd735..403c604f7b0 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -98,6 +98,7 @@ namespace UpdateMask enum DynamicFieldChangeType : uint16 { + UNCHANGED = 0, VALUE_CHANGED = 0x7FFF, VALUE_AND_SIZE_CHANGED = 0x8000 }; |