But the fix behind !RETAIL_COMPATIBLE_CRC

xezon · xezon · commit 061bd827b54b · 2025-06-20T08:11:59.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -2897,12 +2897,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 
 static PlayerMaskType getHumanPlayerMask( void )
 {
+#if RETAIL_COMPATIBLE_CRC
+	PlayerMaskType mask;
+#else
 	PlayerMaskType mask = 0;
+#endif
 	for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 	{
 		const Player *player = ThePlayerList->getNthPlayer(i);
 		if (player->getPlayerType() == PLAYER_HUMAN)
+#if RETAIL_COMPATIBLE_CRC
+			mask &= player->getPlayerMask();
+#else
 			mask |= player->getPlayerMask();
+#endif
 	}
 
 	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -2993,12 +2993,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 
 static PlayerMaskType getHumanPlayerMask( void )
 {
+#if RETAIL_COMPATIBLE_CRC
+	PlayerMaskType mask;
+#else
 	PlayerMaskType mask = 0;
+#endif
 	for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 	{
 		const Player *player = ThePlayerList->getNthPlayer(i);
 		if (player->getPlayerType() == PLAYER_HUMAN)
+#if RETAIL_COMPATIBLE_CRC
+			mask &= player->getPlayerMask();
+#else
 			mask |= player->getPlayerMask();
+#endif
 	}
 
 	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));

Original file line number	Diff line number	Diff line change
`@@ -2897,12 +2897,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)`
`2897`	`2897`
`2898`	`2898`	`static PlayerMaskType getHumanPlayerMask( void )`
`2899`	`2899`	`{`
	`2900`	`+#if RETAIL_COMPATIBLE_CRC`
	`2901`	`+ PlayerMaskType mask;`
	`2902`	`+#else`
`2900`	`2903`	`PlayerMaskType mask = 0;`
	`2904`	`+#endif`
`2901`	`2905`	`for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)`
`2902`	`2906`	`{`
`2903`	`2907`	`const Player *player = ThePlayerList->getNthPlayer(i);`
`2904`	`2908`	`if (player->getPlayerType() == PLAYER_HUMAN)`
	`2909`	`+#if RETAIL_COMPATIBLE_CRC`
	`2910`	`+ mask &= player->getPlayerMask();`
	`2911`	`+#else`
`2905`	`2912`	`mask \|= player->getPlayerMask();`
	`2913`	`+#endif`
`2906`	`2914`	`}`
`2907`	`2915`
`2908`	`2916`	`//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));`
Original file line number	Diff line number	Diff line change
`@@ -2993,12 +2993,20 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)`
`2993`	`2993`
`2994`	`2994`	`static PlayerMaskType getHumanPlayerMask( void )`
`2995`	`2995`	`{`
	`2996`	`+#if RETAIL_COMPATIBLE_CRC`
	`2997`	`+ PlayerMaskType mask;`
	`2998`	`+#else`
`2996`	`2999`	`PlayerMaskType mask = 0;`
	`3000`	`+#endif`
`2997`	`3001`	`for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)`
`2998`	`3002`	`{`
`2999`	`3003`	`const Player *player = ThePlayerList->getNthPlayer(i);`
`3000`	`3004`	`if (player->getPlayerType() == PLAYER_HUMAN)`
	`3005`	`+#if RETAIL_COMPATIBLE_CRC`
	`3006`	`+ mask &= player->getPlayerMask();`
	`3007`	`+#else`
`3001`	`3008`	`mask \|= player->getPlayerMask();`
	`3009`	`+#endif`
`3002`	`3010`	`}`
`3003`	`3011`
`3004`	`3012`	`//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));`