From 774a0626b374fcc31a3d00dd6ec356ed9b79ac81 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 14 Jul 2015 15:36:56 -0700 Subject: [PATCH] Bump all packet version --- .../networking/src/udt/PacketHeaders.cpp | 44 +++++++++---------- libraries/networking/src/udt/PacketHeaders.h | 1 + 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp index bea061ae74..b329125896 100644 --- a/libraries/networking/src/udt/PacketHeaders.cpp +++ b/libraries/networking/src/udt/PacketHeaders.cpp @@ -66,48 +66,48 @@ PacketVersion versionForPacketType(PacketType::Value packetType) { switch (packetType) { case MicrophoneAudioNoEcho: case MicrophoneAudioWithEcho: - return 2; + return 3; case SilentAudioFrame: - return 4; + return 5; case MixedAudio: - return 1; - case InjectAudio: - return 1; - case AvatarData: - return 6; - case AvatarIdentity: - return 1; - case EnvironmentData: return 2; + case InjectAudio: + return 2; + case AvatarData: + return 7; + case AvatarIdentity: + return 2; + case EnvironmentData: + return 3; case DomainList: case DomainListRequest: - return 5; + return 6; case DomainConnectRequest: - return 1; + return 2; case CreateAssignment: case RequestAssignment: - return 2; + return 3; case OctreeStats: - return 1; + return 2; case OctreeDataNack: - return 1; + return 2; case StopNode: - return 1; + return 2; case EntityAdd: case EntityEdit: case EntityData: - return VERSION_ENTITIES_HAVE_SIMULATION_OWNER_AND_ACTIONS_OVER_WIRE; + return VERSION_ENTITIES_NEW_PROTOCOL_LAYER; case EntityEditNack: - return 1; - case EntityErase: return 2; + case EntityErase: + return 3; case AudioStreamStats: - return 1; + return 2; case ICEServerHeartbeat: case ICEServerQuery: - return 1; + return 2; default: - return 0; + return 1; } } diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index 317fafec46..d072d3831f 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -168,5 +168,6 @@ const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30; const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP = 31; const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX = 32; const PacketVersion VERSION_ENTITIES_HAVE_SIMULATION_OWNER_AND_ACTIONS_OVER_WIRE = 33; +const PacketVersion VERSION_ENTITIES_NEW_PROTOCOL_LAYER = 34; #endif // hifi_PacketHeaders_h