Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 07:10:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-enable code that ignores old packets

Browse source
This commit is contained in:
Seth Alves 2015-05-07 11:53:57 -07:00
parent d52a45b57e
commit f52747d8c1
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityItem.cpp
View file

@ -402,9 +402,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
lastEditedFromBufferAdjusted = now; lastEditedFromBufferAdjusted = now;
} }
#if 0 // XXX
bool fromSameServerEdit = (lastEditedFromBuffer == _lastEditedFromRemoteInRemoteTime); bool fromSameServerEdit = (lastEditedFromBuffer == _lastEditedFromRemoteInRemoteTime);
#endif
#ifdef WANT_DEBUG #ifdef WANT_DEBUG
qCDebug(entities) << "data from server **************** "; qCDebug(entities) << "data from server **************** ";
@ -421,7 +419,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
bool ignoreServerPacket = false; // assume we'll use this server packet bool ignoreServerPacket = false; // assume we'll use this server packet
#if 0 // XXX Trying to eliminate this code as a possible source of deviation between interfaces
// If this packet is from the same server edit as the last packet we accepted from the server // If this packet is from the same server edit as the last packet we accepted from the server
// we probably want to use it. // we probably want to use it.
if (fromSameServerEdit) { if (fromSameServerEdit) {
@ -438,7 +435,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
ignoreServerPacket = true; ignoreServerPacket = true;
} }
} }
#endif
if (ignoreServerPacket) { if (ignoreServerPacket) {
overwriteLocalData = false; overwriteLocalData = false;