tweak(network): Transfer assets of disconnected players to allies (#1523)

Stubbjax · web-flow · commit 5765997e7a58 · 2025-09-18T08:33:39.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp
@@ -666,7 +666,12 @@ void Network::processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg)
 	if (pPlayer)
 	{
 		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_SELF_DESTRUCT);
-		msg->appendBooleanArgument(FALSE);
+#if RETAIL_COMPATIBLE_CRC
+		const Bool transferAssets = FALSE;
+#else
+		const Bool transferAssets = TRUE;
+#endif
+		msg->appendBooleanArgument(transferAssets);
 		msg->friend_setPlayerIndex(pPlayer->getPlayerIndex());
 		TheCommandList->appendMessage(msg);
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp
@@ -666,7 +666,12 @@ void Network::processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg)
 	if (pPlayer)
 	{
 		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_SELF_DESTRUCT);
-		msg->appendBooleanArgument(FALSE);
+#if RETAIL_COMPATIBLE_CRC
+		const Bool transferAssets = FALSE;
+#else
+		const Bool transferAssets = TRUE;
+#endif
+		msg->appendBooleanArgument(transferAssets);
 		msg->friend_setPlayerIndex(pPlayer->getPlayerIndex());
 		TheCommandList->appendMessage(msg);
 	}

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,12 @@ void Network::processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg)`
`666`	`666`	`if (pPlayer)`
`667`	`667`	`{`
`668`	`668`	`GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_SELF_DESTRUCT);`
`669`		`- msg->appendBooleanArgument(FALSE);`
	`669`	`+#if RETAIL_COMPATIBLE_CRC`
	`670`	`+ const Bool transferAssets = FALSE;`
	`671`	`+#else`
	`672`	`+ const Bool transferAssets = TRUE;`
	`673`	`+#endif`
	`674`	`+ msg->appendBooleanArgument(transferAssets);`
`670`	`675`	`msg->friend_setPlayerIndex(pPlayer->getPlayerIndex());`
`671`	`676`	`TheCommandList->appendMessage(msg);`
`672`	`677`	`}`