clear unused types and push version to 10

This commit is contained in:
Stephen Birarda 2015-07-16 15:57:19 -07:00
parent a6641908fb
commit eb5fdd7214
2 changed files with 1 additions and 46 deletions

View file

@ -64,50 +64,12 @@ int packArithmeticallyCodedValue(int value, char* destination) {
PacketVersion versionForPacketType(PacketType::Value packetType) { PacketVersion versionForPacketType(PacketType::Value packetType) {
switch (packetType) { switch (packetType) {
case MicrophoneAudioNoEcho:
case MicrophoneAudioWithEcho:
return 3;
case SilentAudioFrame:
return 5;
case MixedAudio:
return 2;
case InjectAudio:
return 2;
case AvatarData:
return 7;
case AvatarIdentity:
return 2;
case EnvironmentData:
return 3;
case DomainList:
case DomainListRequest:
return 6;
case DomainConnectRequest:
return 2;
case CreateAssignment:
case RequestAssignment:
return 3;
case OctreeStats:
return 2;
case OctreeDataNack:
return 2;
case StopNode:
return 2;
case EntityAdd: case EntityAdd:
case EntityEdit: case EntityEdit:
case EntityData: case EntityData:
return VERSION_ENTITIES_NEW_PROTOCOL_LAYER; return VERSION_ENTITIES_NEW_PROTOCOL_LAYER;
case EntityEditNack:
return 2;
case EntityErase:
return 3;
case AudioStreamStats:
return 2;
case ICEServerHeartbeat:
case ICEServerQuery:
return 2;
default: default:
return 1; return 10;
} }
} }
@ -150,7 +112,6 @@ QString nameForPacketType(PacketType::Value packetType) {
PACKET_TYPE_NAME_LOOKUP(StopNode); PACKET_TYPE_NAME_LOOKUP(StopNode);
PACKET_TYPE_NAME_LOOKUP(AudioEnvironment); PACKET_TYPE_NAME_LOOKUP(AudioEnvironment);
PACKET_TYPE_NAME_LOOKUP(EntityEditNack); PACKET_TYPE_NAME_LOOKUP(EntityEditNack);
PACKET_TYPE_NAME_LOOKUP(SignedTransactionPayment);
PACKET_TYPE_NAME_LOOKUP(ICEServerHeartbeat); PACKET_TYPE_NAME_LOOKUP(ICEServerHeartbeat);
PACKET_TYPE_NAME_LOOKUP(DomainServerAddedNode); PACKET_TYPE_NAME_LOOKUP(DomainServerAddedNode);
PACKET_TYPE_NAME_LOOKUP(ICEServerQuery); PACKET_TYPE_NAME_LOOKUP(ICEServerQuery);

View file

@ -48,7 +48,6 @@ namespace PacketType {
DomainConnectionDenied, DomainConnectionDenied,
MuteEnvironment, MuteEnvironment,
AudioStreamStats, AudioStreamStats,
UNUSED, // 20
DomainServerPathQuery, DomainServerPathQuery,
DomainServerPathResponse, DomainServerPathResponse,
DomainServerAddedNode, DomainServerAddedNode,
@ -58,11 +57,7 @@ namespace PacketType {
Jurisdiction, Jurisdiction,
JurisdictionRequest, JurisdictionRequest,
AssignmentClientStatus, AssignmentClientStatus,
UNUSED_7, // 30
UNUSED_8,
UNUSED_9,
NoisyMute, NoisyMute,
UNUSED_10,
AvatarIdentity, // 35 AvatarIdentity, // 35
AvatarBillboard, AvatarBillboard,
DomainConnectRequest, DomainConnectRequest,
@ -77,7 +72,6 @@ namespace PacketType {
StopNode, StopNode,
AudioEnvironment, AudioEnvironment,
EntityEditNack, EntityEditNack,
SignedTransactionPayment,
ICEServerHeartbeat, // 50 ICEServerHeartbeat, // 50
ICEPing, ICEPing,
ICEPingReply ICEPingReply