diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp index 09f4aab429..0805712ec2 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp @@ -31,7 +31,19 @@ #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/networkutil.h" #include "GameNetwork/GameMessageParser.h" +#include +// TheSuperHackers @refactor BobTista 10/06/2025 Extract magic character literals into named constants for improved readability +typedef UnsignedByte NetPacketFieldType; + +namespace NetPacketFieldTypes { + constexpr const NetPacketFieldType CommandType = 'T'; // NetCommandType field + constexpr const NetPacketFieldType Relay = 'R'; // Relay field + constexpr const NetPacketFieldType PlayerId = 'P'; // Player ID field + constexpr const NetPacketFieldType CommandId = 'C'; // Command ID field + constexpr const NetPacketFieldType Frame = 'F'; // Frame field + constexpr const NetPacketFieldType Data = 'D'; // Data payload field +} // This function assumes that all of the fields are either of default value or are // present in the raw data. @@ -50,37 +62,37 @@ NetCommandRef * NetPacket::ConstructNetCommandMsgFromRawData(UnsignedByte *data, switch (data[offset]) { - case 'T': + case NetPacketFieldTypes::CommandType: ++offset; memcpy(&commandType, data + offset, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); break; - case 'R': + case NetPacketFieldTypes::Relay: ++offset; memcpy(&relay, data + offset, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); break; - case 'P': + case NetPacketFieldTypes::PlayerId: ++offset; memcpy(&playerID, data + offset, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); break; - case 'C': + case NetPacketFieldTypes::CommandId: ++offset; memcpy(&commandID, data + offset, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); break; - case 'F': + case NetPacketFieldTypes::Frame: ++offset; memcpy(&frame, data + offset, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); break; - case 'D': + case NetPacketFieldTypes::Data: ++offset; switch (commandType) { @@ -348,7 +360,7 @@ UnsignedInt NetPacket::GetGameCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // relay msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // command type msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); // command ID - msglen += sizeof(UnsignedByte); // the 'D' for the data section. + msglen += sizeof(UnsignedByte); // the NetPacketFieldTypes::Data for the data section. GameMessage *gmsg = cmdMsg->constructGameMessage(); GameMessageParser *parser = newInstance(GameMessageParser)(gmsg); @@ -519,7 +531,7 @@ UnsignedInt NetPacket::GetKeepAliveCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -533,7 +545,7 @@ UnsignedInt NetPacket::GetDisconnectKeepAliveCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -548,7 +560,7 @@ UnsignedInt NetPacket::GetDisconnectPlayerCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte); msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // slot number msglen += sizeof(UnsignedInt); // disconnect frame @@ -564,7 +576,7 @@ UnsignedInt NetPacket::GetPacketRouterQueryCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data return msglen; } @@ -578,7 +590,7 @@ UnsignedInt NetPacket::GetPacketRouterAckCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data return msglen; } @@ -593,7 +605,7 @@ UnsignedInt NetPacket::GetDisconnectChatCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // string msglength UnsignedByte textmsglen = cmdMsg->getText().getLength(); msglen += textmsglen * sizeof(UnsignedShort); @@ -611,7 +623,7 @@ UnsignedInt NetPacket::GetDisconnectVoteCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte); msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // slot number msglen += sizeof(UnsignedInt); // vote frame. @@ -630,7 +642,7 @@ UnsignedInt NetPacket::GetChatCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte); msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // string msglength UnsignedByte textmsglen = cmdMsg->getText().getLength(); msglen += textmsglen * sizeof(UnsignedShort); @@ -648,7 +660,7 @@ UnsignedInt NetPacket::GetProgressMessageSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data ++msglen; // percentage return msglen; @@ -663,7 +675,7 @@ UnsignedInt NetPacket::GetLoadCompleteMessageSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -677,7 +689,7 @@ UnsignedInt NetPacket::GetTimeOutGameStartMessageSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -686,12 +698,12 @@ UnsignedInt NetPacket::GetTimeOutGameStartMessageSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetWrapperCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - ++msglen; // 'T' + ++msglen; // NetPacketFieldTypes::CommandType msglen += sizeof(UnsignedByte); // command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay - ++msglen; // 'D' + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedShort); // m_wrappedCommandID msglen += sizeof(UnsignedInt); // m_chunkNumber @@ -706,12 +718,12 @@ UnsignedInt NetPacket::GetWrapperCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFileCommandSize(NetCommandMsg *msg) { NetFileCommandMsg *filemsg = (NetFileCommandMsg *)msg; UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0 msglen += sizeof(UnsignedInt); // file data length @@ -723,12 +735,12 @@ UnsignedInt NetPacket::GetFileCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFileAnnounceCommandSize(NetCommandMsg *msg) { NetFileAnnounceCommandMsg *filemsg = (NetFileAnnounceCommandMsg *)msg; UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0 msglen += sizeof(UnsignedShort); // m_fileID @@ -739,12 +751,12 @@ UnsignedInt NetPacket::GetFileAnnounceCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFileProgressCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedShort); // m_fileID msglen += sizeof(Int); // m_progress @@ -754,12 +766,12 @@ UnsignedInt NetPacket::GetFileProgressCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetDisconnectFrameCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedInt); // disconnect frame return msglen; @@ -767,12 +779,12 @@ UnsignedInt NetPacket::GetDisconnectFrameCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetDisconnectScreenOffCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedInt); // new frame return msglen; @@ -780,12 +792,12 @@ UnsignedInt NetPacket::GetDisconnectScreenOffCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFrameResendRequestCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedInt); // frame to resend return msglen; @@ -886,39 +898,39 @@ void NetPacket::FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *m //DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithGameCommand for command ID %d", cmdMsg->getID())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the playerID into the packet. - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; // Now copy the GameMessage type into the packet. @@ -1045,18 +1057,18 @@ void NetPacket::FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *ms } - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = type; offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // Put in the command id of the command we are acking. - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; memcpy(buffer + offset, &commandID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); @@ -1072,20 +1084,20 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1093,7 +1105,7 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1101,7 +1113,7 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1109,7 +1121,7 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedShort cmdCount = cmdMsg->getCommandCount(); memcpy(buffer + offset, &cmdCount, sizeof(UnsignedShort)); @@ -1125,20 +1137,20 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d", cmdMsg->getLeavingPlayerID())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); @@ -1146,7 +1158,7 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1154,7 +1166,7 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1162,7 +1174,7 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID(); memcpy(buffer + offset, &leavingPlayerID, sizeof(UnsignedByte)); @@ -1175,13 +1187,13 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1189,7 +1201,7 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1197,7 +1209,7 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1205,7 +1217,7 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; // write the average latency Real averageLatency = cmdMsg->getAverageLatency(); @@ -1223,20 +1235,20 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe //DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithRunAheadCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); @@ -1244,7 +1256,7 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1252,7 +1264,7 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1260,7 +1272,7 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedShort newRunAhead = cmdMsg->getRunAhead(); memcpy(buffer + offset, &newRunAhead, sizeof(UnsignedShort)); @@ -1279,20 +1291,20 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); @@ -1300,7 +1312,7 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1308,7 +1320,7 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1316,7 +1328,7 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt newVal = cmdMsg->getPlayerIndex(); memcpy(buffer + offset, &newVal, sizeof(UnsignedInt)); @@ -1328,24 +1340,24 @@ void NetPacket::FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandR UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1354,25 +1366,25 @@ void NetPacket::FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, N UnsignedShort offset = 0; // Put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // Put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // Put the player ID into the packet. - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1382,13 +1394,13 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1396,7 +1408,7 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1404,7 +1416,7 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1412,7 +1424,7 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedByte slot = cmdMsg->getDisconnectSlot(); memcpy(buffer + offset, &slot, sizeof(slot)); @@ -1429,27 +1441,27 @@ void NetPacket::FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, Net // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1459,13 +1471,13 @@ void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1473,14 +1485,14 @@ void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1490,13 +1502,13 @@ void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1504,14 +1516,14 @@ void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -1528,13 +1540,13 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1542,7 +1554,7 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1550,7 +1562,7 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1558,7 +1570,7 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedByte slot = cmdMsg->getSlot(); memcpy(buffer + offset, &slot, sizeof(slot)); @@ -1575,20 +1587,20 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1596,7 +1608,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1604,7 +1616,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1612,7 +1624,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -1632,25 +1644,25 @@ void NetPacket::FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRe UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // Put the player ID into the packet. - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; buffer[offset] = cmdMsg->getPercentage(); @@ -1662,31 +1674,31 @@ void NetPacket::FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetComma UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1695,30 +1707,30 @@ void NetPacket::FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetC UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1727,32 +1739,32 @@ void NetPacket::FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *m UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -1776,32 +1788,32 @@ void NetPacket::FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetComma UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -1826,32 +1838,32 @@ void NetPacket::FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetComma UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedShort fileID = cmdMsg->getFileID(); @@ -1868,32 +1880,32 @@ void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCo UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame(); @@ -1906,32 +1918,32 @@ void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, N UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt newFrame = cmdMsg->getNewFrame(); @@ -1944,32 +1956,32 @@ void NetPacket::FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, Ne UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt frameToResend = cmdMsg->getFrameToResend(); @@ -2132,7 +2144,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2142,7 +2154,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -2153,7 +2165,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2164,7 +2176,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2175,7 +2187,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2183,7 +2195,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt frameToResend = cmdMsg->getFrameToResend(); @@ -2226,7 +2238,7 @@ Bool NetPacket::isRoomForFrameResendRequestMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); // for the frame to be resent if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -2241,7 +2253,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2251,7 +2263,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -2262,7 +2274,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2273,7 +2285,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2284,7 +2296,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2292,7 +2304,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt newFrame = cmdMsg->getNewFrame(); @@ -2335,7 +2347,7 @@ Bool NetPacket::isRoomForDisconnectScreenOffMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); // for the disconnect frame if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -2350,7 +2362,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2360,7 +2372,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -2371,7 +2383,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2382,7 +2394,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2393,7 +2405,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2401,7 +2413,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame(); @@ -2444,7 +2456,7 @@ Bool NetPacket::isRoomForDisconnectFrameMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); // for the disconnect frame if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -2459,7 +2471,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2469,7 +2481,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2480,7 +2492,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2491,7 +2503,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2500,7 +2512,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -2542,7 +2554,7 @@ Bool NetPacket::isRoomForFileMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0 len += sizeof(UnsignedInt); // filedata length len += cmdMsg->getFileLength(); @@ -2561,7 +2573,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2571,7 +2583,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2582,7 +2594,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2593,7 +2605,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2602,7 +2614,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -2649,7 +2661,7 @@ Bool NetPacket::isRoomForFileAnnounceMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0 len += sizeof(UnsignedShort); // m_fileID len += sizeof(UnsignedByte); // m_playerMask @@ -2668,7 +2680,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2678,7 +2690,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2689,7 +2701,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2700,7 +2712,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2709,7 +2721,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedShort fileID = cmdMsg->getFileID(); @@ -2749,7 +2761,7 @@ Bool NetPacket::isRoomForFileProgressMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += sizeof(UnsignedShort); // m_fileID len += sizeof(Int); // m_progress @@ -2767,7 +2779,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2777,7 +2789,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2788,7 +2800,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2799,7 +2811,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2808,7 +2820,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // wrapped command ID @@ -2879,7 +2891,7 @@ Bool NetPacket::isRoomForWrapperMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += sizeof(UnsignedShort); // wrapped command ID len += sizeof(UnsignedInt); // chunk number len += sizeof(UnsignedInt); // number of chunks @@ -2905,7 +2917,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2915,7 +2927,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2925,7 +2937,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2936,7 +2948,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2944,7 +2956,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -2978,7 +2990,7 @@ Bool NetPacket::isRoomForTimeOutGameStartMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -2997,7 +3009,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3007,7 +3019,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3017,7 +3029,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3028,7 +3040,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3036,7 +3048,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -3070,7 +3082,7 @@ Bool NetPacket::isRoomForLoadCompleteMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3089,7 +3101,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3099,7 +3111,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3109,7 +3121,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3117,7 +3129,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { m_lastPlayerID = cmdMsg->getPlayerID(); } - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPercentage(); @@ -3154,7 +3166,7 @@ Bool NetPacket::isRoomForProgressMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data ++len; // percentage if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -3175,7 +3187,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3185,7 +3197,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3197,7 +3209,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3210,7 +3222,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3220,7 +3232,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedByte slot = cmdMsg->getSlot(); memcpy(m_packet + m_packetLen, &slot, sizeof(slot)); @@ -3265,7 +3277,7 @@ Bool NetPacket::isRoomForDisconnectVoteMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // slot number len += sizeof(UnsignedInt); // vote frame @@ -3285,7 +3297,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3295,7 +3307,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3307,7 +3319,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3317,7 +3329,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -3354,7 +3366,7 @@ Bool NetPacket::isRoomForDisconnectChatMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // string length UnsignedByte textLen = cmdMsg->getText().getLength(); len += textLen * sizeof(UnsignedShort); @@ -3372,7 +3384,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3382,7 +3394,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -3393,7 +3405,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3405,7 +3417,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3418,7 +3430,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3428,7 +3440,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -3477,7 +3489,7 @@ Bool NetPacket::isRoomForChatMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // string length UnsignedByte textLen = cmdMsg->getText().getLength(); len += textLen * sizeof(UnsignedShort); @@ -3496,7 +3508,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3506,7 +3518,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3518,7 +3530,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3528,7 +3540,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router ack command, player id %d", m_lastPlayerID)); @@ -3561,7 +3573,7 @@ Bool NetPacket::isRoomForPacketRouterAckMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3576,7 +3588,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3586,7 +3598,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3598,7 +3610,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3608,7 +3620,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router query command, player id %d", m_lastPlayerID)); @@ -3641,7 +3653,7 @@ Bool NetPacket::isRoomForPacketRouterQueryMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3659,7 +3671,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3669,7 +3681,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3681,7 +3693,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3694,7 +3706,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3704,7 +3716,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedByte slot = cmdMsg->getDisconnectSlot(); memcpy(m_packet + m_packetLen, &slot, sizeof(slot)); @@ -3749,7 +3761,7 @@ Bool NetPacket::isRoomForDisconnectPlayerMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // slot number len += sizeof(UnsignedInt); // disconnectFrame if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -3768,7 +3780,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3778,7 +3790,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3788,7 +3800,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3796,7 +3808,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { m_lastPlayerID = cmdMsg->getPlayerID(); } - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -3830,7 +3842,7 @@ Bool NetPacket::isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3846,7 +3858,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3856,7 +3868,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3866,7 +3878,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3874,7 +3886,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { m_lastPlayerID = cmdMsg->getPlayerID(); } - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -3908,7 +3920,7 @@ Bool NetPacket::isRoomForKeepAliveMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3926,7 +3938,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3936,7 +3948,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3947,7 +3959,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -3959,7 +3971,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3972,7 +3984,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3982,7 +3994,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedShort newRunAhead = cmdMsg->getRunAhead(); memcpy(m_packet + m_packetLen, &newRunAhead, sizeof(UnsignedShort)); @@ -4030,7 +4042,7 @@ Bool NetPacket::isRoomForRunAheadMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedShort); len += sizeof(UnsignedByte); if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -4049,7 +4061,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4059,7 +4071,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4070,7 +4082,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4082,7 +4094,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4095,7 +4107,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4105,7 +4117,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt newVal = cmdMsg->getPlayerIndex(); memcpy(m_packet + m_packetLen, &newVal, sizeof(UnsignedInt)); @@ -4149,7 +4161,7 @@ Bool NetPacket::isRoomForDestroyPlayerMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -4168,7 +4180,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4178,7 +4190,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4190,7 +4202,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4203,7 +4215,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4213,7 +4225,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // write the average latency Real averageLatency = cmdMsg->getAverageLatency(); @@ -4257,7 +4269,7 @@ Bool NetPacket::isRoomForRunAheadMetricsMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += sizeof(UnsignedShort); len += sizeof(Real); if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -4278,7 +4290,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4288,7 +4300,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4299,7 +4311,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4311,7 +4323,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4324,7 +4336,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4334,7 +4346,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID(); memcpy(m_packet + m_packetLen, &leavingPlayerID, sizeof(UnsignedByte)); @@ -4376,7 +4388,7 @@ Bool NetPacket::isRoomForPlayerLeaveMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedByte); if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -4411,7 +4423,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4421,7 +4433,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4432,7 +4444,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4444,7 +4456,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4457,7 +4469,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4467,7 +4479,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedShort cmdCount = cmdMsg->getCommandCount(); memcpy(m_packet + m_packetLen, &cmdCount, sizeof(UnsignedShort)); @@ -4512,7 +4524,7 @@ Bool NetPacket::isRoomForFrameMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedShort); if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -4590,7 +4602,7 @@ Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, Unsig // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addAckCommand - adding ack for command %d for player %d", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID())); // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4599,7 +4611,7 @@ Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, Unsig } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4608,7 +4620,7 @@ Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, Unsig } // Put in the command id of the command we are acking. - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; memcpy(m_packet + m_packetLen, &commandID, sizeof(UnsignedShort)); m_packetLen += sizeof(UnsignedShort); @@ -4641,7 +4653,7 @@ Bool NetPacket::isRoomForAckMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedShort); len += sizeof(UnsignedByte); if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -4732,7 +4744,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4742,7 +4754,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4753,7 +4765,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4764,7 +4776,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the playerID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4776,7 +4788,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4784,7 +4796,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // Now copy the GameMessage type into the packet. @@ -4920,7 +4932,7 @@ Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) { GameMessageParser *parser = newInstance(GameMessageParser)(gmsg); - ++msglen; // for 'D' + ++msglen; // for NetPacketFieldTypes::Data msglen += sizeof(GameMessage::Type); msglen += sizeof(UnsignedByte); // Int numTypes = parser->getNumTypes(); @@ -5002,32 +5014,32 @@ NetCommandList * NetPacket::getCommandList() { switch(m_packet[i]) { - case 'T': + case NetPacketFieldTypes::CommandType: ++i; memcpy(&commandType, m_packet + i, sizeof(UnsignedByte)); i += sizeof(UnsignedByte); break; - case 'F': + case NetPacketFieldTypes::Frame: ++i; memcpy(&frame, m_packet + i, sizeof(UnsignedInt)); i += sizeof(UnsignedInt); break; - case 'P': + case NetPacketFieldTypes::PlayerId: ++i; memcpy(&playerID, m_packet + i, sizeof(UnsignedByte)); i += sizeof(UnsignedByte); break; - case 'R': + case NetPacketFieldTypes::Relay: ++i; memcpy(&relay, m_packet + i, sizeof(UnsignedByte)); i += sizeof(UnsignedByte); break; - case 'C': + case NetPacketFieldTypes::CommandId: ++i; memcpy(&commandID, m_packet + i, sizeof(UnsignedShort)); i += sizeof(UnsignedShort); break; - case 'D': { + case NetPacketFieldTypes::Data: { ++i; NetCommandMsg *msg = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp index 776ad7eb02..6b5007a4b6 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp @@ -31,7 +31,19 @@ #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/networkutil.h" #include "GameNetwork/GameMessageParser.h" +#include +// TheSuperHackers @refactor BobTista 10/06/2025 Extract magic character literals into named constants for improved readability +typedef UnsignedByte NetPacketFieldType; + +namespace NetPacketFieldTypes { + constexpr const NetPacketFieldType CommandType = 'T'; // NetCommandType field + constexpr const NetPacketFieldType Relay = 'R'; // Relay field + constexpr const NetPacketFieldType PlayerId = 'P'; // Player ID field + constexpr const NetPacketFieldType CommandId = 'C'; // Command ID field + constexpr const NetPacketFieldType Frame = 'F'; // Frame field + constexpr const NetPacketFieldType Data = 'D'; // Data payload field +} // This function assumes that all of the fields are either of default value or are // present in the raw data. @@ -50,37 +62,37 @@ NetCommandRef * NetPacket::ConstructNetCommandMsgFromRawData(UnsignedByte *data, switch (data[offset]) { - case 'T': + case NetPacketFieldTypes::CommandType: ++offset; memcpy(&commandType, data + offset, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); break; - case 'R': + case NetPacketFieldTypes::Relay: ++offset; memcpy(&relay, data + offset, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); break; - case 'P': + case NetPacketFieldTypes::PlayerId: ++offset; memcpy(&playerID, data + offset, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); break; - case 'C': + case NetPacketFieldTypes::CommandId: ++offset; memcpy(&commandID, data + offset, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); break; - case 'F': + case NetPacketFieldTypes::Frame: ++offset; memcpy(&frame, data + offset, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); break; - case 'D': + case NetPacketFieldTypes::Data: ++offset; switch (commandType) { @@ -348,7 +360,7 @@ UnsignedInt NetPacket::GetGameCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // relay msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // command type msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); // command ID - msglen += sizeof(UnsignedByte); // the 'D' for the data section. + msglen += sizeof(UnsignedByte); // the NetPacketFieldTypes::Data for the data section. GameMessage *gmsg = cmdMsg->constructGameMessage(); GameMessageParser *parser = newInstance(GameMessageParser)(gmsg); @@ -519,7 +531,7 @@ UnsignedInt NetPacket::GetKeepAliveCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -533,7 +545,7 @@ UnsignedInt NetPacket::GetDisconnectKeepAliveCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -548,7 +560,7 @@ UnsignedInt NetPacket::GetDisconnectPlayerCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte); msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // slot number msglen += sizeof(UnsignedInt); // disconnect frame @@ -564,7 +576,7 @@ UnsignedInt NetPacket::GetPacketRouterQueryCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data return msglen; } @@ -578,7 +590,7 @@ UnsignedInt NetPacket::GetPacketRouterAckCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data return msglen; } @@ -593,7 +605,7 @@ UnsignedInt NetPacket::GetDisconnectChatCommandSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // string msglength UnsignedByte textmsglen = cmdMsg->getText().getLength(); msglen += textmsglen * sizeof(UnsignedShort); @@ -611,7 +623,7 @@ UnsignedInt NetPacket::GetDisconnectVoteCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte); msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // slot number msglen += sizeof(UnsignedInt); // vote frame. @@ -630,7 +642,7 @@ UnsignedInt NetPacket::GetChatCommandSize(NetCommandMsg *msg) { msglen += sizeof(UnsignedByte); msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); - ++msglen; // the 'D' + ++msglen; // the NetPacketFieldTypes::Data msglen += sizeof(UnsignedByte); // string msglength UnsignedByte textmsglen = cmdMsg->getText().getLength(); msglen += textmsglen * sizeof(UnsignedShort); @@ -648,7 +660,7 @@ UnsignedInt NetPacket::GetProgressMessageSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data ++msglen; // percentage return msglen; @@ -663,7 +675,7 @@ UnsignedInt NetPacket::GetLoadCompleteMessageSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -677,7 +689,7 @@ UnsignedInt NetPacket::GetTimeOutGameStartMessageSize(NetCommandMsg *msg) { ++msglen; msglen += sizeof(UnsignedByte); - ++msglen; // For the 'D' + ++msglen; // For the NetPacketFieldTypes::Data return msglen; } @@ -686,12 +698,12 @@ UnsignedInt NetPacket::GetTimeOutGameStartMessageSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetWrapperCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - ++msglen; // 'T' + ++msglen; // NetPacketFieldTypes::CommandType msglen += sizeof(UnsignedByte); // command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay - ++msglen; // 'D' + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedShort); // m_wrappedCommandID msglen += sizeof(UnsignedInt); // m_chunkNumber @@ -706,12 +718,12 @@ UnsignedInt NetPacket::GetWrapperCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFileCommandSize(NetCommandMsg *msg) { NetFileCommandMsg *filemsg = (NetFileCommandMsg *)msg; UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0 msglen += sizeof(UnsignedInt); // file data length @@ -723,12 +735,12 @@ UnsignedInt NetPacket::GetFileCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFileAnnounceCommandSize(NetCommandMsg *msg) { NetFileAnnounceCommandMsg *filemsg = (NetFileAnnounceCommandMsg *)msg; UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0 msglen += sizeof(UnsignedShort); // m_fileID @@ -739,12 +751,12 @@ UnsignedInt NetPacket::GetFileAnnounceCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFileProgressCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedShort); // m_fileID msglen += sizeof(Int); // m_progress @@ -754,12 +766,12 @@ UnsignedInt NetPacket::GetFileProgressCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetDisconnectFrameCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedInt); // disconnect frame return msglen; @@ -767,12 +779,12 @@ UnsignedInt NetPacket::GetDisconnectFrameCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetDisconnectScreenOffCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedInt); // new frame return msglen; @@ -780,12 +792,12 @@ UnsignedInt NetPacket::GetDisconnectScreenOffCommandSize(NetCommandMsg *msg) { UnsignedInt NetPacket::GetFrameResendRequestCommandSize(NetCommandMsg *msg) { UnsignedInt msglen = 0; - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID - msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::CommandType and command type + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::PlayerId and player ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID + msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // NetPacketFieldTypes::Relay and relay - ++msglen; // 'D' + ++msglen; // NetPacketFieldTypes::Data msglen += sizeof(UnsignedInt); // frame to resend return msglen; @@ -886,39 +898,39 @@ void NetPacket::FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *m //DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithGameCommand for command ID %d", cmdMsg->getID())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the playerID into the packet. - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; // Now copy the GameMessage type into the packet. @@ -1045,18 +1057,18 @@ void NetPacket::FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *ms } - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = type; offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // Put in the command id of the command we are acking. - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; memcpy(buffer + offset, &commandID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); @@ -1072,20 +1084,20 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1093,7 +1105,7 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1101,7 +1113,7 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1109,7 +1121,7 @@ void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef * // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedShort cmdCount = cmdMsg->getCommandCount(); memcpy(buffer + offset, &cmdCount, sizeof(UnsignedShort)); @@ -1125,20 +1137,20 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d", cmdMsg->getLeavingPlayerID())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); @@ -1146,7 +1158,7 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1154,7 +1166,7 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1162,7 +1174,7 @@ void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetComman // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID(); memcpy(buffer + offset, &leavingPlayerID, sizeof(UnsignedByte)); @@ -1175,13 +1187,13 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency())); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1189,7 +1201,7 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1197,7 +1209,7 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1205,7 +1217,7 @@ void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; // write the average latency Real averageLatency = cmdMsg->getAverageLatency(); @@ -1223,20 +1235,20 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe //DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithRunAheadCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); @@ -1244,7 +1256,7 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1252,7 +1264,7 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1260,7 +1272,7 @@ void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRe // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedShort newRunAhead = cmdMsg->getRunAhead(); memcpy(buffer + offset, &newRunAhead, sizeof(UnsignedShort)); @@ -1279,20 +1291,20 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); @@ -1300,7 +1312,7 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1308,7 +1320,7 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1316,7 +1328,7 @@ void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetComm // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt newVal = cmdMsg->getPlayerIndex(); memcpy(buffer + offset, &newVal, sizeof(UnsignedInt)); @@ -1328,24 +1340,24 @@ void NetPacket::FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandR UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1354,25 +1366,25 @@ void NetPacket::FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, N UnsignedShort offset = 0; // Put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // Put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // Put the player ID into the packet. - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1382,13 +1394,13 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1396,7 +1408,7 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1404,7 +1416,7 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1412,7 +1424,7 @@ void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetC // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedByte slot = cmdMsg->getDisconnectSlot(); memcpy(buffer + offset, &slot, sizeof(slot)); @@ -1429,27 +1441,27 @@ void NetPacket::FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, Net // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1459,13 +1471,13 @@ void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1473,14 +1485,14 @@ void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCo // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1490,13 +1502,13 @@ void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1504,14 +1516,14 @@ void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -1528,13 +1540,13 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1542,7 +1554,7 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1550,7 +1562,7 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1558,7 +1570,7 @@ void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCom // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedByte slot = cmdMsg->getSlot(); memcpy(buffer + offset, &slot, sizeof(slot)); @@ -1575,20 +1587,20 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command")); // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the execution frame into the packet. - buffer[offset] = 'F'; + buffer[offset] = NetPacketFieldTypes::Frame; ++offset; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(buffer+offset, &newframe, sizeof(UnsignedInt)); offset += sizeof(UnsignedInt); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); @@ -1596,7 +1608,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); @@ -1604,7 +1616,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); @@ -1612,7 +1624,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -1632,25 +1644,25 @@ void NetPacket::FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRe UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); // Put the player ID into the packet. - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; buffer[offset] = cmdMsg->getPercentage(); @@ -1662,31 +1674,31 @@ void NetPacket::FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetComma UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1695,30 +1707,30 @@ void NetPacket::FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetC UnsignedShort offset = 0; // If necessary, put the NetCommandType into the packet. - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // If necessary, put the relay into the packet. - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; UnsignedByte newRelay = msg->getRelay(); memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte)); offset += sizeof(UnsignedByte); - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // If necessary, specify the command ID of this command. - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(UnsignedShort)); offset += sizeof(UnsignedShort); - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; } @@ -1727,32 +1739,32 @@ void NetPacket::FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *m UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -1776,32 +1788,32 @@ void NetPacket::FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetComma UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -1826,32 +1838,32 @@ void NetPacket::FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetComma UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedShort fileID = cmdMsg->getFileID(); @@ -1868,32 +1880,32 @@ void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCo UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame(); @@ -1906,32 +1918,32 @@ void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, N UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt newFrame = cmdMsg->getNewFrame(); @@ -1944,32 +1956,32 @@ void NetPacket::FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, Ne UnsignedInt offset = 0; // command type - buffer[offset] = 'T'; + buffer[offset] = NetPacketFieldTypes::CommandType; ++offset; buffer[offset] = cmdMsg->getNetCommandType(); offset += sizeof(UnsignedByte); // relay - buffer[offset] = 'R'; + buffer[offset] = NetPacketFieldTypes::Relay; ++offset; buffer[offset] = msg->getRelay(); offset += sizeof(UnsignedByte); // player ID - buffer[offset] = 'P'; + buffer[offset] = NetPacketFieldTypes::PlayerId; ++offset; buffer[offset] = cmdMsg->getPlayerID(); offset += sizeof(UnsignedByte); // command ID - buffer[offset] = 'C'; + buffer[offset] = NetPacketFieldTypes::CommandId; ++offset; UnsignedShort newID = cmdMsg->getID(); memcpy(buffer + offset, &newID, sizeof(newID)); offset += sizeof(newID); // data - buffer[offset] = 'D'; + buffer[offset] = NetPacketFieldTypes::Data; ++offset; UnsignedInt frameToResend = cmdMsg->getFrameToResend(); @@ -2132,7 +2144,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2142,7 +2154,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -2153,7 +2165,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2164,7 +2176,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2175,7 +2187,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2183,7 +2195,7 @@ Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt frameToResend = cmdMsg->getFrameToResend(); @@ -2226,7 +2238,7 @@ Bool NetPacket::isRoomForFrameResendRequestMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); // for the frame to be resent if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -2241,7 +2253,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2251,7 +2263,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -2262,7 +2274,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2273,7 +2285,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2284,7 +2296,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2292,7 +2304,7 @@ Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt newFrame = cmdMsg->getNewFrame(); @@ -2335,7 +2347,7 @@ Bool NetPacket::isRoomForDisconnectScreenOffMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); // for the disconnect frame if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -2350,7 +2362,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2360,7 +2372,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -2371,7 +2383,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2382,7 +2394,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2393,7 +2405,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2401,7 +2413,7 @@ Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame(); @@ -2444,7 +2456,7 @@ Bool NetPacket::isRoomForDisconnectFrameMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); // for the disconnect frame if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -2459,7 +2471,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2469,7 +2481,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2480,7 +2492,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2491,7 +2503,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2500,7 +2512,7 @@ Bool NetPacket::addFileCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -2542,7 +2554,7 @@ Bool NetPacket::isRoomForFileMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0 len += sizeof(UnsignedInt); // filedata length len += cmdMsg->getFileLength(); @@ -2561,7 +2573,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2571,7 +2583,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2582,7 +2594,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2593,7 +2605,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2602,7 +2614,7 @@ Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; AsciiString filename = cmdMsg->getPortableFilename(); // PORTABLE @@ -2649,7 +2661,7 @@ Bool NetPacket::isRoomForFileAnnounceMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0 len += sizeof(UnsignedShort); // m_fileID len += sizeof(UnsignedByte); // m_playerMask @@ -2668,7 +2680,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2678,7 +2690,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2689,7 +2701,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2700,7 +2712,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2709,7 +2721,7 @@ Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedShort fileID = cmdMsg->getFileID(); @@ -2749,7 +2761,7 @@ Bool NetPacket::isRoomForFileProgressMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += sizeof(UnsignedShort); // m_fileID len += sizeof(Int); // m_progress @@ -2767,7 +2779,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2777,7 +2789,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2788,7 +2800,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary put the player ID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2799,7 +2811,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2808,7 +2820,7 @@ Bool NetPacket::addWrapperCommand(NetCommandRef *msg) { m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // wrapped command ID @@ -2879,7 +2891,7 @@ Bool NetPacket::isRoomForWrapperMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte) + sizeof(UnsignedShort); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += sizeof(UnsignedShort); // wrapped command ID len += sizeof(UnsignedInt); // chunk number len += sizeof(UnsignedInt); // number of chunks @@ -2905,7 +2917,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -2915,7 +2927,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -2925,7 +2937,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -2936,7 +2948,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -2944,7 +2956,7 @@ Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -2978,7 +2990,7 @@ Bool NetPacket::isRoomForTimeOutGameStartMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -2997,7 +3009,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3007,7 +3019,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3017,7 +3029,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3028,7 +3040,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3036,7 +3048,7 @@ Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -3070,7 +3082,7 @@ Bool NetPacket::isRoomForLoadCompleteMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3089,7 +3101,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3099,7 +3111,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3109,7 +3121,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3117,7 +3129,7 @@ Bool NetPacket::addProgressMessage(NetCommandRef *msg) { m_lastPlayerID = cmdMsg->getPlayerID(); } - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPercentage(); @@ -3154,7 +3166,7 @@ Bool NetPacket::isRoomForProgressMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data ++len; // percentage if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -3175,7 +3187,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3185,7 +3197,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3197,7 +3209,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3210,7 +3222,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3220,7 +3232,7 @@ Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedByte slot = cmdMsg->getSlot(); memcpy(m_packet + m_packetLen, &slot, sizeof(slot)); @@ -3265,7 +3277,7 @@ Bool NetPacket::isRoomForDisconnectVoteMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // slot number len += sizeof(UnsignedInt); // vote frame @@ -3285,7 +3297,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3295,7 +3307,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3307,7 +3319,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3317,7 +3329,7 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -3354,7 +3366,7 @@ Bool NetPacket::isRoomForDisconnectChatMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // string length UnsignedByte textLen = cmdMsg->getText().getLength(); len += textLen * sizeof(UnsignedShort); @@ -3372,7 +3384,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3382,7 +3394,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -3393,7 +3405,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3405,7 +3417,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3418,7 +3430,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3428,7 +3440,7 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnicodeString unitext = cmdMsg->getText(); UnsignedByte length = unitext.getLength(); @@ -3477,7 +3489,7 @@ Bool NetPacket::isRoomForChatMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // string length UnsignedByte textLen = cmdMsg->getText().getLength(); len += textLen * sizeof(UnsignedShort); @@ -3496,7 +3508,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3506,7 +3518,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3518,7 +3530,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3528,7 +3540,7 @@ Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router ack command, player id %d", m_lastPlayerID)); @@ -3561,7 +3573,7 @@ Bool NetPacket::isRoomForPacketRouterAckMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3576,7 +3588,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3586,7 +3598,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3598,7 +3610,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3608,7 +3620,7 @@ Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router query command, player id %d", m_lastPlayerID)); @@ -3641,7 +3653,7 @@ Bool NetPacket::isRoomForPacketRouterQueryMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3659,7 +3671,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3669,7 +3681,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3681,7 +3693,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3694,7 +3706,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3704,7 +3716,7 @@ Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedByte slot = cmdMsg->getDisconnectSlot(); memcpy(m_packet + m_packetLen, &slot, sizeof(slot)); @@ -3749,7 +3761,7 @@ Bool NetPacket::isRoomForDisconnectPlayerMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // the 'D' + ++len; // the NetPacketFieldTypes::Data len += sizeof(UnsignedByte); // slot number len += sizeof(UnsignedInt); // disconnectFrame if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -3768,7 +3780,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3778,7 +3790,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3788,7 +3800,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3796,7 +3808,7 @@ Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) { m_lastPlayerID = cmdMsg->getPlayerID(); } - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -3830,7 +3842,7 @@ Bool NetPacket::isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3846,7 +3858,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3856,7 +3868,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3866,7 +3878,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3874,7 +3886,7 @@ Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) { m_lastPlayerID = cmdMsg->getPlayerID(); } - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; ++m_numCommands; @@ -3908,7 +3920,7 @@ Bool NetPacket::isRoomForKeepAliveMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // For the 'D' + ++len; // For the NetPacketFieldTypes::Data if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; } @@ -3926,7 +3938,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -3936,7 +3948,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -3947,7 +3959,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -3959,7 +3971,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -3972,7 +3984,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -3982,7 +3994,7 @@ Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedShort newRunAhead = cmdMsg->getRunAhead(); memcpy(m_packet + m_packetLen, &newRunAhead, sizeof(UnsignedShort)); @@ -4030,7 +4042,7 @@ Bool NetPacket::isRoomForRunAheadMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedShort); len += sizeof(UnsignedByte); if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -4049,7 +4061,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4059,7 +4071,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4070,7 +4082,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4082,7 +4094,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4095,7 +4107,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4105,7 +4117,7 @@ Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedInt newVal = cmdMsg->getPlayerIndex(); memcpy(m_packet + m_packetLen, &newVal, sizeof(UnsignedInt)); @@ -4149,7 +4161,7 @@ Bool NetPacket::isRoomForDestroyPlayerMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedInt); if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -4168,7 +4180,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4178,7 +4190,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4190,7 +4202,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4203,7 +4215,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4213,7 +4225,7 @@ Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // write the average latency Real averageLatency = cmdMsg->getAverageLatency(); @@ -4257,7 +4269,7 @@ Bool NetPacket::isRoomForRunAheadMetricsMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // 'D' + ++len; // NetPacketFieldTypes::Data len += sizeof(UnsignedShort); len += sizeof(Real); if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -4278,7 +4290,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4288,7 +4300,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4299,7 +4311,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4311,7 +4323,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4324,7 +4336,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4334,7 +4346,7 @@ Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID(); memcpy(m_packet + m_packetLen, &leavingPlayerID, sizeof(UnsignedByte)); @@ -4376,7 +4388,7 @@ Bool NetPacket::isRoomForPlayerLeaveMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedByte); if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -4411,7 +4423,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4421,7 +4433,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4432,7 +4444,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4444,7 +4456,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay)); if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4457,7 +4469,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4467,7 +4479,7 @@ Bool NetPacket::addFrameCommand(NetCommandRef *msg) { // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID)); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; UnsignedShort cmdCount = cmdMsg->getCommandCount(); memcpy(m_packet + m_packetLen, &cmdCount, sizeof(UnsignedShort)); @@ -4512,7 +4524,7 @@ Bool NetPacket::isRoomForFrameMessage(NetCommandRef *msg) { len += sizeof(UnsignedShort) + sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedShort); if ((len + m_packetLen) > MAX_PACKET_SIZE) { return FALSE; @@ -4590,7 +4602,7 @@ Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, Unsig // DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addAckCommand - adding ack for command %d for player %d", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID())); // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4599,7 +4611,7 @@ Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, Unsig } if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4608,7 +4620,7 @@ Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, Unsig } // Put in the command id of the command we are acking. - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; memcpy(m_packet + m_packetLen, &commandID, sizeof(UnsignedShort)); m_packetLen += sizeof(UnsignedShort); @@ -4641,7 +4653,7 @@ Bool NetPacket::isRoomForAckMessage(NetCommandRef *msg) { len += sizeof(UnsignedByte); } - ++len; // for 'D' + ++len; // for NetPacketFieldTypes::Data len += sizeof(UnsignedShort); len += sizeof(UnsignedByte); if ((len + m_packetLen) > MAX_PACKET_SIZE) { @@ -4732,7 +4744,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the NetCommandType into the packet. if (m_lastCommandType != cmdMsg->getNetCommandType()) { - m_packet[m_packetLen] = 'T'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandType; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getNetCommandType(); m_packetLen += sizeof(UnsignedByte); @@ -4742,7 +4754,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the execution frame into the packet. if (m_lastFrame != cmdMsg->getExecutionFrame()) { - m_packet[m_packetLen] = 'F'; + m_packet[m_packetLen] = NetPacketFieldTypes::Frame; ++m_packetLen; UnsignedInt newframe = cmdMsg->getExecutionFrame(); memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt)); @@ -4753,7 +4765,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the relay into the packet. if (m_lastRelay != msg->getRelay()) { - m_packet[m_packetLen] = 'R'; + m_packet[m_packetLen] = NetPacketFieldTypes::Relay; ++m_packetLen; UnsignedByte newRelay = msg->getRelay(); memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte)); @@ -4764,7 +4776,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, put the playerID into the packet. if (m_lastPlayerID != cmdMsg->getPlayerID()) { - m_packet[m_packetLen] = 'P'; + m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId; ++m_packetLen; m_packet[m_packetLen] = cmdMsg->getPlayerID(); m_packetLen += sizeof(UnsignedByte); @@ -4776,7 +4788,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { // If necessary, specify the command ID of this command. if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) { - m_packet[m_packetLen] = 'C'; + m_packet[m_packetLen] = NetPacketFieldTypes::CommandId; ++m_packetLen; UnsignedShort newID = cmdMsg->getID(); memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort)); @@ -4784,7 +4796,7 @@ Bool NetPacket::addGameCommand(NetCommandRef *msg) { } m_lastCommandID = cmdMsg->getID(); - m_packet[m_packetLen] = 'D'; + m_packet[m_packetLen] = NetPacketFieldTypes::Data; ++m_packetLen; // Now copy the GameMessage type into the packet. @@ -4920,7 +4932,7 @@ Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) { GameMessageParser *parser = newInstance(GameMessageParser)(gmsg); - ++msglen; // for 'D' + ++msglen; // for NetPacketFieldTypes::Data msglen += sizeof(GameMessage::Type); msglen += sizeof(UnsignedByte); // Int numTypes = parser->getNumTypes(); @@ -5002,32 +5014,32 @@ NetCommandList * NetPacket::getCommandList() { switch(m_packet[i]) { - case 'T': + case NetPacketFieldTypes::CommandType: ++i; memcpy(&commandType, m_packet + i, sizeof(UnsignedByte)); i += sizeof(UnsignedByte); break; - case 'F': + case NetPacketFieldTypes::Frame: ++i; memcpy(&frame, m_packet + i, sizeof(UnsignedInt)); i += sizeof(UnsignedInt); break; - case 'P': + case NetPacketFieldTypes::PlayerId: ++i; memcpy(&playerID, m_packet + i, sizeof(UnsignedByte)); i += sizeof(UnsignedByte); break; - case 'R': + case NetPacketFieldTypes::Relay: ++i; memcpy(&relay, m_packet + i, sizeof(UnsignedByte)); i += sizeof(UnsignedByte); break; - case 'C': + case NetPacketFieldTypes::CommandId: ++i; memcpy(&commandID, m_packet + i, sizeof(UnsignedShort)); i += sizeof(UnsignedShort); break; - case 'D': { + case NetPacketFieldTypes::Data: { ++i; NetCommandMsg *msg = NULL;