refactor(network): use specific command classes in ConnectionManager

bobtista · bobtista · commit b413c2f670c6 · 2025-10-23T16:01:54.000-04:00
Update ConnectionManager to instantiate specific NetCommandMsg subclasses
directly instead of creating generic NetCommandMsg and setting the type.

Changes:
- Use NetLoadCompleteCommandMsg in loadProgressComplete()
- Use NetTimeOutGameStartCommandMsg in sendTimeOutGameStart()
- Remove manual setNetCommandType() calls (type set in constructor)

Applied to both Generals and Zero Hour
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -2236,12 +2236,11 @@ void ConnectionManager::updateLoadProgress( Int progress )
 
 void ConnectionManager::loadProgressComplete()
 {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
+	NetLoadCompleteCommandMsg *msg = newInstance(NetLoadCompleteCommandMsg);
 	msg->setPlayerID( m_localSlot );
 	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
 		msg->setID(GenerateNextCommandID());
 	}
-	msg->setNetCommandType(NETCOMMANDTYPE_LOADCOMPLETE);
 	processLoadComplete(msg);
 	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
 
@@ -2250,9 +2249,8 @@ void ConnectionManager::loadProgressComplete()
 
 void ConnectionManager::sendTimeOutGameStart()
 {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
+	NetTimeOutGameStartCommandMsg *msg = newInstance(NetTimeOutGameStartCommandMsg);
 	msg->setPlayerID( m_localSlot );
-	msg->setNetCommandType(NETCOMMANDTYPE_TIMEOUTSTART);
 	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
 		msg->setID(GenerateNextCommandID());
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -2222,12 +2222,11 @@ void ConnectionManager::updateLoadProgress( Int progress )
 
 void ConnectionManager::loadProgressComplete()
 {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
+	NetLoadCompleteCommandMsg *msg = newInstance(NetLoadCompleteCommandMsg);
 	msg->setPlayerID( m_localSlot );
 	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
 		msg->setID(GenerateNextCommandID());
 	}
-	msg->setNetCommandType(NETCOMMANDTYPE_LOADCOMPLETE);
 	processLoadComplete(msg);
 	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
 
@@ -2236,9 +2235,8 @@ void ConnectionManager::loadProgressComplete()
 
 void ConnectionManager::sendTimeOutGameStart()
 {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
+	NetTimeOutGameStartCommandMsg *msg = newInstance(NetTimeOutGameStartCommandMsg);
 	msg->setPlayerID( m_localSlot );
-	msg->setNetCommandType(NETCOMMANDTYPE_TIMEOUTSTART);
 	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
 		msg->setID(GenerateNextCommandID());
 	}

Original file line number	Diff line number	Diff line change
`@@ -2236,12 +2236,11 @@ void ConnectionManager::updateLoadProgress( Int progress )`
`2236`	`2236`
`2237`	`2237`	`void ConnectionManager::loadProgressComplete()`
`2238`	`2238`	`{`
`2239`		`- NetCommandMsg *msg = newInstance(NetCommandMsg);`
	`2239`	`+ NetLoadCompleteCommandMsg *msg = newInstance(NetLoadCompleteCommandMsg);`
`2240`	`2240`	`msg->setPlayerID( m_localSlot );`
`2241`	`2241`	`if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {`
`2242`	`2242`	`msg->setID(GenerateNextCommandID());`
`2243`	`2243`	`}`
`2244`		`- msg->setNetCommandType(NETCOMMANDTYPE_LOADCOMPLETE);`
`2245`	`2244`	`processLoadComplete(msg);`
`2246`	`2245`	`sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));`
`2247`	`2246`
`@@ -2250,9 +2249,8 @@ void ConnectionManager::loadProgressComplete()`
`2250`	`2249`
`2251`	`2250`	`void ConnectionManager::sendTimeOutGameStart()`
`2252`	`2251`	`{`
`2253`		`- NetCommandMsg *msg = newInstance(NetCommandMsg);`
	`2252`	`+ NetTimeOutGameStartCommandMsg *msg = newInstance(NetTimeOutGameStartCommandMsg);`
`2254`	`2253`	`msg->setPlayerID( m_localSlot );`
`2255`		`- msg->setNetCommandType(NETCOMMANDTYPE_TIMEOUTSTART);`
`2256`	`2254`	`if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {`
`2257`	`2255`	`msg->setID(GenerateNextCommandID());`
`2258`	`2256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2222,12 +2222,11 @@ void ConnectionManager::updateLoadProgress( Int progress )`
`2222`	`2222`
`2223`	`2223`	`void ConnectionManager::loadProgressComplete()`
`2224`	`2224`	`{`
`2225`		`- NetCommandMsg *msg = newInstance(NetCommandMsg);`
	`2225`	`+ NetLoadCompleteCommandMsg *msg = newInstance(NetLoadCompleteCommandMsg);`
`2226`	`2226`	`msg->setPlayerID( m_localSlot );`
`2227`	`2227`	`if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {`
`2228`	`2228`	`msg->setID(GenerateNextCommandID());`
`2229`	`2229`	`}`
`2230`		`- msg->setNetCommandType(NETCOMMANDTYPE_LOADCOMPLETE);`
`2231`	`2230`	`processLoadComplete(msg);`
`2232`	`2231`	`sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));`
`2233`	`2232`
`@@ -2236,9 +2235,8 @@ void ConnectionManager::loadProgressComplete()`
`2236`	`2235`
`2237`	`2236`	`void ConnectionManager::sendTimeOutGameStart()`
`2238`	`2237`	`{`
`2239`		`- NetCommandMsg *msg = newInstance(NetCommandMsg);`
	`2238`	`+ NetTimeOutGameStartCommandMsg *msg = newInstance(NetTimeOutGameStartCommandMsg);`
`2240`	`2239`	`msg->setPlayerID( m_localSlot );`
`2241`		`- msg->setNetCommandType(NETCOMMANDTYPE_TIMEOUTSTART);`
`2242`	`2240`	`if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {`
`2243`	`2241`	`msg->setID(GenerateNextCommandID());`
`2244`	`2242`	`}`