refactor: add getByteCount() methods to more message classes and use it

Author: bobtista

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

@@ -310,6 +310,8 @@ class NetDisconnectChatCommandMsg : public NetCommandMsg
 	UnicodeString getText();
 	void setText(UnicodeString text);
 
+	size_t getByteCount() const;
+
 protected:
 	UnicodeString m_text;
 };
@@ -426,6 +428,8 @@ class NetFileCommandMsg : public NetCommandMsg
 	UnsignedByte * getFileData();
 	void setFileData(UnsignedByte *data, UnsignedInt dataLength);
 
+	size_t getByteCount() const;
+
 protected:
 	AsciiString m_portableFilename;
 
@@ -453,6 +457,8 @@ class NetFileAnnounceCommandMsg : public NetCommandMsg
 	UnsignedByte getPlayerMask(void);
 	void setPlayerMask(UnsignedByte playerMask);
 
+	size_t getByteCount() const;
+
 protected:
 	AsciiString m_portableFilename;
 	UnsignedShort m_fileID;

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

@@ -767,6 +767,17 @@ size_t NetChatCommandMsg::getByteCount() const
 	return m_text.getLength() * sizeof(UnsignedShort) + sizeof(m_playerMask);
 }
 
+//-------------------------
+// NetDisconnectChatCommandMsg
+//-------------------------
+/**
+ * Get the byte count for this disconnect chat message.
+ */
+size_t NetDisconnectChatCommandMsg::getByteCount() const
+{
+	return m_text.getLength() * sizeof(UnsignedShort);
+}
+
 //-------------------------
 // NetDisconnectVoteCommandMsg
 //-------------------------
@@ -948,6 +959,16 @@ void NetFileCommandMsg::setFileData(UnsignedByte *data, UnsignedInt dataLength)
 	memcpy(m_data, data, dataLength);
 }
 
+/**
+ * Get the byte count for this file command message.
+ */
+size_t NetFileCommandMsg::getByteCount() const
+{
+	return m_portableFilename.getLength() + 1  // filename + null terminator
+		+ sizeof(UnsignedInt)  // file data length
+		+ m_dataLength;  // the file data
+}
+
 //-------------------------
 // NetFileAnnounceCommandMsg
 //-------------------------
@@ -987,6 +1008,15 @@ void NetFileAnnounceCommandMsg::setPlayerMask(UnsignedByte playerMask) {
 	m_playerMask = playerMask;
 }
 
+/**
+ * Get the byte count for this file announce command message.
+ */
+size_t NetFileAnnounceCommandMsg::getByteCount() const
+{
+	return m_portableFilename.getLength() + 1  // filename + null terminator
+		+ sizeof(m_fileID)  // file ID
+		+ sizeof(m_playerMask);  // player mask
+}
 
 //-------------------------
 // NetFileProgressCommandMsg

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

@@ -466,8 +466,7 @@ UnsignedInt NetPacket::GetPacketRouterAckCommandSize(NetCommandMsg *msg) {
 
 UnsignedInt NetPacket::GetDisconnectChatCommandSize(NetCommandMsg *msg) {
 	NetDisconnectChatCommandMsg *cmdMsg = static_cast<NetDisconnectChatCommandMsg*>(msg);
-	UnsignedByte textmsglen = cmdMsg->getText().getLength();
-	return sizeof(NetPacketDisconnectChatCommandHeader) + (textmsglen * sizeof(UnsignedShort));
+	return sizeof(NetPacketDisconnectChatCommandHeader) + cmdMsg->getByteCount();
 }
 
 UnsignedInt NetPacket::GetDisconnectVoteCommandSize(NetCommandMsg *msg) {
@@ -497,18 +496,12 @@ UnsignedInt NetPacket::GetWrapperCommandSize(NetCommandMsg *msg) {
 
 UnsignedInt NetPacket::GetFileCommandSize(NetCommandMsg *msg) {
 	NetFileCommandMsg *filemsg = (NetFileCommandMsg *)msg;
-	return sizeof(NetPacketFileCommandHeader) 
-		+ filemsg->getPortableFilename().getLength() + 1  // PORTABLE filename and the terminating 0
-		+ sizeof(UnsignedInt)  // file data length
-		+ filemsg->getFileLength();  // the file data
+	return sizeof(NetPacketFileCommandHeader) + filemsg->getByteCount();
 }
 
 UnsignedInt NetPacket::GetFileAnnounceCommandSize(NetCommandMsg *msg) {
 	NetFileAnnounceCommandMsg *filemsg = (NetFileAnnounceCommandMsg *)msg;
-	return sizeof(NetPacketFileAnnounceCommandHeader)
-		+ filemsg->getPortableFilename().getLength() + 1  // PORTABLE filename and the terminating 0
-		+ sizeof(UnsignedShort)  // m_fileID
-		+ sizeof(UnsignedByte);  // m_playerMask
+	return sizeof(NetPacketFileAnnounceCommandHeader) + filemsg->getByteCount();
 }
 
 UnsignedInt NetPacket::GetFileProgressCommandSize(NetCommandMsg *msg) {