formatting, fix a bug

This commit is contained in:
Seth Alves 2015-10-01 14:51:33 -07:00
parent 56b50b5fb3
commit fa7a5f1a61

View file

@ -35,6 +35,7 @@
bool EntityItem::_sendPhysicsUpdates = true; bool EntityItem::_sendPhysicsUpdates = true;
int EntityItem::_maxActionsDataSize = 800; int EntityItem::_maxActionsDataSize = 800;
quint64 EntityItem::_rememberDeletedActionTime = 20; // seconds quint64 EntityItem::_rememberDeletedActionTime = 20; // seconds
EntityItem::EntityItem(const EntityItemID& entityItemID) : EntityItem::EntityItem(const EntityItemID& entityItemID) :
_type(EntityTypes::Unknown), _type(EntityTypes::Unknown),
_id(entityItemID), _id(entityItemID),
@ -1682,7 +1683,7 @@ void EntityItem::deserializeActionsInternal() {
QMutableHashIterator<QUuid, quint64> _previouslyDeletedIter(_previouslyDeletedActions); QMutableHashIterator<QUuid, quint64> _previouslyDeletedIter(_previouslyDeletedActions);
while (_previouslyDeletedIter.hasNext()) { while (_previouslyDeletedIter.hasNext()) {
_previouslyDeletedIter.next(); _previouslyDeletedIter.next();
if (_previouslyDeletedIter.value() - now > _rememberDeletedActionTime) { if (now - _previouslyDeletedIter.value() > _rememberDeletedActionTime) {
_previouslyDeletedActions.remove(_previouslyDeletedIter.key()); _previouslyDeletedActions.remove(_previouslyDeletedIter.key());
} }
} }