Fixed nopch build and some leftover warnings

This commit is contained in:
Shauren
2016-07-20 13:27:04 +02:00
parent 420d096b6a
commit e405ac5f41
14 changed files with 31 additions and 30 deletions
+2 -2
View File
@@ -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());