From e7c5a24e3d37f5e4bc8f54aefa60395b14cc71b7 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Tue, 2 Jun 2015 09:38:45 -0700 Subject: [PATCH] fixed packet number increment logic --- libraries/networking/src/PacketHeaders.cpp | 4 +--- libraries/networking/src/PacketHeaders.h | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/networking/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp index c52f44b6b9..78bb3f11e1 100644 --- a/libraries/networking/src/PacketHeaders.cpp +++ b/libraries/networking/src/PacketHeaders.cpp @@ -73,7 +73,7 @@ PacketVersion versionForPacketType(PacketType packetType) { case PacketTypeEntityAdd: case PacketTypeEntityEdit: case PacketTypeEntityData: - return VERSION_NO_ENTITY_ID_SWAP; + return VERSION_ENTITIES_LINE_POINTS; case PacketTypeEntityErase: return 2; case PacketTypeAudioStreamStats: @@ -135,8 +135,6 @@ QString nameForPacketType(PacketType packetType) { PACKET_TYPE_NAME_LOOKUP(PacketTypeUnverifiedPingReply); PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityAdd); PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityEdit); - PACKET_TYPE_NAME_LOOKUP(PacketTypeParticleEntitiesFix); - PACKET_TYPE_NAME_LOOKUP(PacketTypeLinePoints); default: return QString("Type: ") + QString::number((int)packetType); } diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h index aad7f508a1..228df1cdde 100644 --- a/libraries/networking/src/PacketHeaders.h +++ b/libraries/networking/src/PacketHeaders.h @@ -79,9 +79,7 @@ enum PacketType { PacketTypeSignedTransactionPayment, PacketTypeIceServerHeartbeat, // 50 PacketTypeUnverifiedPing, - PacketTypeUnverifiedPingReply, - PacketTypeParticleEntitiesFix, - PacketTypeLinePoints + PacketTypeUnverifiedPingReply }; typedef char PacketVersion; @@ -184,5 +182,6 @@ const PacketVersion VERSION_ENTITIES_HAVE_COLLISION_SOUND_URL = 25; const PacketVersion VERSION_ENTITIES_HAVE_FRICTION = 26; const PacketVersion VERSION_NO_ENTITY_ID_SWAP = 27; const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28; +const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29; #endif // hifi_PacketHeaders_h