refactor(network): complete struct inheritance for all command message getByteCount() functions

Author: bobtista

GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacketStructs.h

@@ -269,6 +269,22 @@ struct PackedNetChatCommandMsg : public PackedNetCommandMsg {
 struct PackedNetDisconnectChatCommandMsg : public PackedNetCommandMsg {
 };
 
+// Game command packed struct (variable: game message data follows)
+struct PackedNetGameCommandMsg : public PackedNetCommandMsg {
+	NetPacketFrameField frame;
+	NetPacketCommandIdField commandId;
+};
+
+// File command packed struct (variable: filename and file data follow)
+struct PackedNetFileCommandMsg : public PackedNetCommandMsg {
+	NetPacketCommandIdField commandId;
+};
+
+// File announce command packed struct (variable: filename and metadata follow)
+struct PackedNetFileAnnounceCommandMsg : public PackedNetCommandMsg {
+	NetPacketCommandIdField commandId;
+};
+
 struct NetPacketDisconnectVoteCommand {
 	NetPacketCommandTypeField commandType;
 	NetPacketRelayField relay;

GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp

@@ -236,8 +236,7 @@ void NetGameCommandMsg::setGameMessageType(GameMessage::Type type) {
  * Get the byte count for this game command message.
  */
 size_t NetGameCommandMsg::getByteCount() const {
-	// Fixed header portion
-	UnsignedShort msglen = sizeof(NetPacketGameCommandHeader);
+	UnsignedShort msglen = sizeof(PackedNetGameCommandMsg);
 
 	// Variable data portion
 	GameMessage *gmsg = const_cast<NetGameCommandMsg*>(this)->constructGameMessage();
@@ -1036,7 +1035,7 @@ void NetFileCommandMsg::setFileData(UnsignedByte *data, UnsignedInt dataLength)
  */
 size_t NetFileCommandMsg::getByteCount() const
 {
-	return m_portableFilename.getLength() + 1  // filename + null terminator
+	return sizeof(PackedNetFileCommandMsg) + m_portableFilename.getLength() + 1  // filename + null terminator
 		+ sizeof(UnsignedInt)  // file data length
 		+ m_dataLength;  // the file data
 }
@@ -1085,7 +1084,7 @@ void NetFileAnnounceCommandMsg::setPlayerMask(UnsignedByte playerMask) {
  */
 size_t NetFileAnnounceCommandMsg::getByteCount() const
 {
-	return m_portableFilename.getLength() + 1  // filename + null terminator
+	return sizeof(PackedNetFileAnnounceCommandMsg) + m_portableFilename.getLength() + 1  // filename + null terminator
 		+ sizeof(m_fileID)  // file ID
 		+ sizeof(m_playerMask);  // player mask
 }