From 9ff6e079ee7d4bcf2fab2261bd557140dfad4a4d Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 31 Jan 2018 10:09:23 -0800 Subject: [PATCH] fix functions --- libraries/entities/src/EntityItem.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 7e227c90d6..79f9f97aa4 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -2835,7 +2835,7 @@ DEFINE_PROPERTY_ACCESSOR(quint32, StaticCertificateVersion, staticCertificateVer uint32_t EntityItem::getDirtyFlags() const { uint32_t result; withReadLock([&] { - result = _flags; + result = _flags & 0x0000ffff; }); return result; } @@ -2843,12 +2843,14 @@ uint32_t EntityItem::getDirtyFlags() const { void EntityItem::markDirtyFlags(uint32_t mask) { withWriteLock([&] { + mask &= 0x0000ffff; _flags |= mask; }); } void EntityItem::clearDirtyFlags(uint32_t mask) { withWriteLock([&] { + mask &= 0x0000ffff; _flags &= ~mask; }); } @@ -2856,19 +2858,21 @@ void EntityItem::clearDirtyFlags(uint32_t mask) { uint32_t EntityItem::getSpecialFlags() const { uint32_t result; withReadLock([&] { - result = _flags; + result = _flags & 0xffff0000; }); return result; } void EntityItem::markSpecialFlags(uint32_t mask) { withWriteLock([&] { + mask &= 0xffff0000; _flags |= mask; }); } void EntityItem::clearSpecialFlags(uint32_t mask) { withWriteLock([&] { + mask &= 0xffff0000; _flags &= ~mask; }); }