Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-30 17:43:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6960 from sethalves/fix-adjust-edit-packet-for-clock-skew

Browse source 
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
This commit is contained in:
Brad Hefta-Gaub 2016-01-28 12:31:27 -08:00
commit 49bbf42995
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -763,7 +763,7 @@ void EntityItem::adjustEditPacketForClockSkew(QByteArray& buffer, int clockSkew)
// lastEdited // lastEdited
quint64 lastEditedInLocalTime; quint64 lastEditedInLocalTime;
memcpy(&lastEditedInLocalTime, dataAt, sizeof(lastEditedInLocalTime)); memcpy(&lastEditedInLocalTime, dataAt, sizeof(lastEditedInLocalTime));
quint64 lastEditedInServerTime = lastEditedInLocalTime + clockSkew; quint64 lastEditedInServerTime = lastEditedInLocalTime > 0 ? lastEditedInLocalTime + clockSkew : 0;
memcpy(dataAt, &lastEditedInServerTime, sizeof(lastEditedInServerTime)); memcpy(dataAt, &lastEditedInServerTime, sizeof(lastEditedInServerTime));
#ifdef WANT_DEBUG #ifdef WANT_DEBUG
qCDebug(entities, "EntityItem::adjustEditPacketForClockSkew()..."); qCDebug(entities, "EntityItem::adjustEditPacketForClockSkew()...");