refactor: move NetPacketFieldTypes to header, use const NetPacketFieldType type, and add struct constructors

Author: bobtista

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

@@ -30,43 +30,72 @@
 // Ensure structs are packed to 1-byte alignment for network protocol compatibility
 #pragma pack(push, 1)
 
+// Network packet field type definitions
+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
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Common packet field structures
 ////////////////////////////////////////////////////////////////////////////////
 
 // Command Type field: 'T' + UnsignedByte
 struct NetPacketCommandTypeField {
-	char header;              // 'T'
+	const NetPacketFieldType type;    // 'T'
 	UnsignedByte commandType;
+
+	NetPacketCommandTypeField() : type(NetPacketFieldTypes::CommandType) {}
+	NetPacketCommandTypeField(UnsignedByte cmdType) : type(NetPacketFieldTypes::CommandType), commandType(cmdType) {}
 };
 
 // Relay field: 'R' + UnsignedByte
 struct NetPacketRelayField {
-	char header;              // 'R'
+	const NetPacketFieldType type;    // 'R'
 	UnsignedByte relay;
+
+	NetPacketRelayField() : type(NetPacketFieldTypes::Relay) {}
+	NetPacketRelayField(UnsignedByte r) : type(NetPacketFieldTypes::Relay), relay(r) {}
 };
 
 // Player ID field: 'P' + UnsignedByte
 struct NetPacketPlayerIdField {
-	char header;              // 'P'
+	const NetPacketFieldType type;    // 'P'
 	UnsignedByte playerId;
+
+	NetPacketPlayerIdField() : type(NetPacketFieldTypes::PlayerId) {}
+	NetPacketPlayerIdField(UnsignedByte id) : type(NetPacketFieldTypes::PlayerId), playerId(id) {}
 };
 
 // Frame field: 'F' + UnsignedInt
 struct NetPacketFrameField {
-	char header;              // 'F'
+	const NetPacketFieldType type;    // 'F'
 	UnsignedInt frame;
+
+	NetPacketFrameField() : type(NetPacketFieldTypes::Frame) {}
+	NetPacketFrameField(UnsignedInt f) : type(NetPacketFieldTypes::Frame), frame(f) {}
 };
 
 // Command ID field: 'C' + UnsignedShort
 struct NetPacketCommandIdField {
-	char header;              // 'C'
+	const NetPacketFieldType type;    // 'C'
 	UnsignedShort commandId;
+
+	NetPacketCommandIdField() : type(NetPacketFieldTypes::CommandId) {}
+	NetPacketCommandIdField(UnsignedShort id) : type(NetPacketFieldTypes::CommandId), commandId(id) {}
 };
 
 // Data field header: 'D' (followed by variable-length data)
 struct NetPacketDataFieldHeader {
-	char header;              // 'D'
+	const NetPacketFieldType type;    // 'D'
+
+	NetPacketDataFieldHeader() : type(NetPacketFieldTypes::Data) {}
 };
 
 ////////////////////////////////////////////////////////////////////////////////

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

@@ -34,17 +34,6 @@
 #include <Utility/CppMacros.h>
 #include "GameNetwork/NetPacketStructs.h"
 
-// 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.