address comments

Author: bobtista

Core/GameEngine/CMakeLists.txt

@@ -3,7 +3,6 @@ set(GAMEENGINE_SRC
 #    Include/Common/ActionManager.h
     Include/Common/AddonCompat.h
     Include/Common/ArchiveFile.h
-    Include/GameNetwork/NetPacketStructs.h
     Include/Common/ArchiveFileSystem.h
     Include/Common/AsciiString.h
     Include/Common/AudioAffect.h
@@ -546,6 +545,7 @@ set(GAMEENGINE_SRC
     Include/GameNetwork/NetCommandRef.h
     Include/GameNetwork/NetCommandWrapperList.h
     Include/GameNetwork/NetPacket.h
+    Include/GameNetwork/NetPacketStructs.h
     Include/GameNetwork/NetworkDefs.h
     Include/GameNetwork/NetworkInterface.h
     Include/GameNetwork/networkutil.h

Core/GameEngine/Include/GameNetwork/NetCommandMsg.h

@@ -44,9 +44,9 @@ class NetCommandMsg : public MemoryPoolObject
 	inline void setExecutionFrame(UnsignedInt frame) { m_executionFrame = frame; }
 	inline void setPlayerID(UnsignedInt playerID) { m_playerID = playerID; }
 	inline void setID(UnsignedShort id) { m_id = id; }
-	inline UnsignedInt getExecutionFrame() { return m_executionFrame; }
-	inline UnsignedInt getPlayerID() { return m_playerID; }
-	inline UnsignedShort getID() { return m_id; }
+	inline UnsignedInt getExecutionFrame() const { return m_executionFrame; }
+	inline UnsignedInt getPlayerID() const { return m_playerID; }
+	inline UnsignedShort getID() const { return m_id; }
 	inline void setNetCommandType(NetCommandType type) { m_commandType = type; }
 	inline NetCommandType getNetCommandType() { return m_commandType; }
 	virtual Int getSortNumber();
@@ -77,7 +77,7 @@ class NetGameCommandMsg : public NetCommandMsg
 	NetGameCommandMsg(GameMessage *msg);
 	//virtual ~NetGameCommandMsg();
 
-	GameMessage *constructGameMessage();
+	GameMessage *constructGameMessage() const;
 	void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg);
 	void setGameMessageType(GameMessage::Type type);
 
@@ -396,6 +396,7 @@ class NetProgressCommandMsg: public NetCommandMsg
 	void setPercentage( UnsignedByte percent );
 
 	virtual size_t getPackedByteCount() const;
+
 protected:
 	UnsignedByte m_percent;
 };

Core/GameEngine/Include/GameNetwork/NetPacketStructs.h

@@ -1,6 +1,6 @@
 /*
 **	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 TheSuperHackers.
+**	Copyright 2025 TheSuperHackers
 **
 **	This program is free software: you can redistribute it and/or modify
 **	it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// TheSuperHackers @refactor BobTista 10/07/2025
+// TheSuperHackers @refactor BobTista 07/10/2025
 // Packed struct definitions for network packet serialization/deserialization.
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ -52,37 +52,37 @@ namespace NetPacketFieldTypes {
 
 // Command Type field: 'T' + UnsignedByte
 struct NetPacketCommandTypeField {
-	char header;              // 'T'
+	char header;
 	UnsignedByte commandType;
 };
 
 // Relay field: 'R' + UnsignedByte
 struct NetPacketRelayField {
-	char header;              // 'R'
+	char header;
 	UnsignedByte relay;
 };
 
 // Player ID field: 'P' + UnsignedByte
 struct NetPacketPlayerIdField {
-	char header;              // 'P'
+	char header;
 	UnsignedByte playerId;
 };
 
 // Frame field: 'F' + UnsignedInt
 struct NetPacketFrameField {
-	char header;              // 'F'
+	char header;
 	UnsignedInt frame;
 };
 
 // Command ID field: 'C' + UnsignedShort
 struct NetPacketCommandIdField {
-	char header;              // 'C'
+	char header;
 	UnsignedShort commandId;
 };
 
 // Data field header: 'D' (followed by variable-length data)
 struct NetPacketDataFieldHeader {
-	char header;              // 'D'
+	char header;
 };
 
 ////////////////////////////////////////////////////////////////////////////////

Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp

@@ -171,7 +171,7 @@ static Int indexFromMask(UnsignedInt mask)
 /**
  * Construct a new GameMessage object from the data in this object.
  */
-GameMessage *NetGameCommandMsg::constructGameMessage()
+GameMessage *NetGameCommandMsg::constructGameMessage() const
 {
 	GameMessage *retval = newInstance(GameMessage)(m_type);
 
@@ -232,14 +232,11 @@ void NetGameCommandMsg::setGameMessageType(GameMessage::Type type) {
 	m_type = type;
 }
 
-/**
- * Get the byte count for this game command message.
- */
 size_t NetGameCommandMsg::getPackedByteCount() const {
 	UnsignedShort msglen = sizeof(NetPacketGameCommand);
 
 	// Variable data portion
-	GameMessage *gmsg = const_cast<NetGameCommandMsg*>(this)->constructGameMessage();
+	GameMessage *gmsg = constructGameMessage();
 	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
 
 	msglen += sizeof(GameMessage::Type);
@@ -882,23 +879,22 @@ void NetChatCommandMsg::setPlayerMask( Int playerMask )
 	m_playerMask = playerMask;
 }
 
-/**
- * Get the byte count for this chat message.
- */
 size_t NetChatCommandMsg::getPackedByteCount() const
 {
-	return sizeof(NetPacketChatCommand) + sizeof(UnsignedByte) /* text length byte */ + m_text.getByteCount() + sizeof(m_playerMask);
+	return sizeof(NetPacketChatCommand)
+		+ sizeof(UnsignedByte) // text length byte
+		+ m_text.getByteCount()
+		+ sizeof(m_playerMask);
 }
 
 //-------------------------
 // NetDisconnectChatCommandMsg
 //-------------------------
-/**
- * Get the byte count for this disconnect chat message.
- */
 size_t NetDisconnectChatCommandMsg::getPackedByteCount() const
 {
-	return sizeof(NetPacketDisconnectChatCommand) + sizeof(UnsignedByte) /* text length byte */ + m_text.getByteCount();
+	return sizeof(NetPacketDisconnectChatCommand)
+		+ sizeof(UnsignedByte) // text length byte
+		+ m_text.getByteCount();
 }
 
 //-------------------------
@@ -1094,13 +1090,11 @@ void NetFileCommandMsg::setFileData(UnsignedByte *data, UnsignedInt dataLength)
 	memcpy(m_data, data, dataLength);
 }
 
-/**
- * Get the byte count for this file command message.
- */
 size_t NetFileCommandMsg::getPackedByteCount() const
 {
-	return sizeof(NetPacketFileCommand) + m_portableFilename.getLength() + 1  // filename + null terminator
-		+ sizeof(UnsignedInt)  // file data length
+	return sizeof(NetPacketFileCommand)
+		+ m_portableFilename.getLength() + 1  // filename + null terminator
+		+ sizeof(m_dataLength)  // file data length
 		+ m_dataLength;  // the file data
 }
 
@@ -1143,9 +1137,6 @@ void NetFileAnnounceCommandMsg::setPlayerMask(UnsignedByte playerMask) {
 	m_playerMask = playerMask;
 }
 
-/**
- * Get the byte count for this file announce command message.
- */
 size_t NetFileAnnounceCommandMsg::getPackedByteCount() const
 {
 	return sizeof(NetPacketFileAnnounceCommand)

Generals/Code/GameEngine/CMakeLists.txt

@@ -502,7 +502,6 @@ set(GAMEENGINE_SRC
 #    Include/GameNetwork/NetCommandRef.h
 #    Include/GameNetwork/NetCommandWrapperList.h
 #    Include/GameNetwork/NetPacket.h
-#    Include/GameNetwork/NetPacketStructs.h
 #    Include/GameNetwork/NetworkDefs.h
 #    Include/GameNetwork/NetworkInterface.h
 #    Include/GameNetwork/networkutil.h

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -541,7 +541,6 @@ set(GAMEENGINE_SRC
 #    Include/GameNetwork/NetCommandRef.h
 #    Include/GameNetwork/NetCommandWrapperList.h
 #    Include/GameNetwork/NetPacket.h
-#    Include/GameNetwork/NetPacketStructs.h
 #    Include/GameNetwork/NetworkDefs.h
 #    Include/GameNetwork/NetworkInterface.h
 #    Include/GameNetwork/networkutil.h