Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5215 from ZappoMan/repairBadFormat

Browse source 
repair bad ordering of PROP_SCRIPT_TIMESTAMP
This commit is contained in:
Seth Alves 2015-06-26 15:03:40 -07:00
commit 50c0ee1f7e
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityPropertyFlags.h
View file

@ -55,7 +55,6 @@ enum EntityPropertyList {
PROP_DAMPING, PROP_DAMPING,
PROP_LIFETIME, PROP_LIFETIME,
PROP_SCRIPT, PROP_SCRIPT,
PROP_SCRIPT_TIMESTAMP,
// these properties are supported by some derived classes // these properties are supported by some derived classes
PROP_COLOR, PROP_COLOR,
@ -124,6 +123,7 @@ enum EntityPropertyList {
PROP_DESCRIPTION, PROP_DESCRIPTION,
PROP_FACE_CAMERA, PROP_FACE_CAMERA,
PROP_SCRIPT_TIMESTAMP,
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// ATTENTION: add new properties ABOVE this line // ATTENTION: add new properties ABOVE this line

2
libraries/networking/src/PacketHeaders.cpp
View file

@ -73,7 +73,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketTypeEntityAdd: case PacketTypeEntityAdd:
case PacketTypeEntityEdit: case PacketTypeEntityEdit:
case PacketTypeEntityData: case PacketTypeEntityData:
return VERSION_ENTITIES_SCRIPT_TIMESTAMP; return VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX;
case PacketTypeEntityErase: case PacketTypeEntityErase:
return 2; return 2;
case PacketTypeAudioStreamStats: case PacketTypeAudioStreamStats:

1
libraries/networking/src/PacketHeaders.h
View file

@ -185,5 +185,6 @@ const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28;
const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29; const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29;
const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30; const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30;
const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP = 31; const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP = 31;
const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX = 32;
#endif // hifi_PacketHeaders_h #endif // hifi_PacketHeaders_h