build: Add RETAIL_COMPATIBLE_BUG as build prerequisite for the tunnel healing fix (#1783)

Stubbjax · web-flow · commit d453a21d4ca0 · 2025-11-03T18:39:31.000+01:00
diff --git a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h
@@ -59,7 +59,7 @@ class TunnelTracker : public MemoryPoolObject,
 	static void destroyObject( Object *obj, void *userData ); ///< Callback for Iterate Contained system
 	static void healObject( Object *obj, void *frames ); ///< Callback for Iterate Contained system
 
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 	void healObjects(Real frames);	///< heal all objects within the tunnel
 #else
 	void healObjects();	///< heal all objects within the tunnel
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -677,7 +677,7 @@ void Player::update()
 		}
 	}
 
-#if !RETAIL_COMPATIBLE_CRC
+#if !RETAIL_COMPATIBLE_BUG && !RETAIL_COMPATIBLE_CRC
 	// TheSuperHackers @bugfix Stubbjax 26/09/2025 The Tunnel System now heals
 	// all units once per frame instead of once per frame per Tunnel Network.
 	TunnelTracker* tunnelSystem = getTunnelSystem();
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp b/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
@@ -256,7 +256,7 @@ void TunnelTracker::destroyObject( Object *obj, void * )
 
 // ------------------------------------------------------------------------
 	// heal all the objects within the tunnel system using the iterateContained function
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 void TunnelTracker::healObjects(Real frames)
 {
 	iterateContained(healObject, &frames, FALSE);
@@ -280,7 +280,7 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 {
 
 	//get the number of frames to heal
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 	Real *framesForFullHeal = (Real*)frames;
 #else
 	UnsignedInt* framesForFullHeal = (UnsignedInt*)frames;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
@@ -403,7 +403,7 @@ UpdateSleepTime TunnelContain::update( void )
 	if (controllingPlayer)
 	{
 		TunnelTracker *tunnelSystem = controllingPlayer->getTunnelSystem();
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 		if (tunnelSystem)
 		{
 			const TunnelContainModuleData* modData = getTunnelContainModuleData();
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h
@@ -59,7 +59,7 @@ class TunnelTracker : public MemoryPoolObject,
 	static void destroyObject( Object *obj, void *userData ); ///< Callback for Iterate Contained system
 	static void healObject( Object *obj, void *frames ); ///< Callback for Iterate Contained system
 
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 	void healObjects(Real frames);	///< heal all objects within the tunnel
 #else
 	void healObjects();	///< heal all objects within the tunnel
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -717,7 +717,7 @@ void Player::update()
 		}
 	}
 
-#if !RETAIL_COMPATIBLE_CRC
+#if !RETAIL_COMPATIBLE_BUG && !RETAIL_COMPATIBLE_CRC
 	// TheSuperHackers @bugfix Stubbjax 26/09/2025 The Tunnel System now heals
 	// all units once per frame instead of once per frame per Tunnel Network.
 	TunnelTracker* tunnelSystem = getTunnelSystem();
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
@@ -257,7 +257,7 @@ void TunnelTracker::destroyObject( Object *obj, void * )
 
 // ------------------------------------------------------------------------
 	// heal all the objects within the tunnel system using the iterateContained function
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 void TunnelTracker::healObjects(Real frames)
 {
 	iterateContained(healObject, &frames, FALSE);
@@ -281,7 +281,7 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 {
 
 	//get the number of frames to heal
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 	Real *framesForFullHeal = (Real*)frames;
 #else
 	UnsignedInt* framesForFullHeal = (UnsignedInt*)frames;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
@@ -539,7 +539,7 @@ UpdateSleepTime TunnelContain::update( void )
 	if (controllingPlayer)
 	{
 		TunnelTracker *tunnelSystem = controllingPlayer->getTunnelSystem();
-#if RETAIL_COMPATIBLE_CRC
+#if RETAIL_COMPATIBLE_BUG || RETAIL_COMPATIBLE_CRC
 		if (tunnelSystem)
 		{
 			const TunnelContainModuleData* modData = getTunnelContainModuleData();

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ void Player::update()`
`677`	`677`	`}`
`678`	`678`	`}`
`679`	`679`
`680`		`-#if !RETAIL_COMPATIBLE_CRC`
	`680`	`+#if !RETAIL_COMPATIBLE_BUG && !RETAIL_COMPATIBLE_CRC`
`681`	`681`	`// TheSuperHackers @bugfix Stubbjax 26/09/2025 The Tunnel System now heals`
`682`	`682`	`// all units once per frame instead of once per frame per Tunnel Network.`
`683`	`683`	`TunnelTracker* tunnelSystem = getTunnelSystem();`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ UpdateSleepTime TunnelContain::update( void )`
`403`	`403`	`if (controllingPlayer)`
`404`	`404`	`{`
`405`	`405`	`TunnelTracker *tunnelSystem = controllingPlayer->getTunnelSystem();`
`406`		`-#if RETAIL_COMPATIBLE_CRC`
	`406`	`+#if RETAIL_COMPATIBLE_BUG \|\| RETAIL_COMPATIBLE_CRC`
`407`	`407`	`if (tunnelSystem)`
`408`	`408`	`{`
`409`	`409`	`const TunnelContainModuleData* modData = getTunnelContainModuleData();`
Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ void Player::update()`
`717`	`717`	`}`
`718`	`718`	`}`
`719`	`719`
`720`		`-#if !RETAIL_COMPATIBLE_CRC`
	`720`	`+#if !RETAIL_COMPATIBLE_BUG && !RETAIL_COMPATIBLE_CRC`
`721`	`721`	`// TheSuperHackers @bugfix Stubbjax 26/09/2025 The Tunnel System now heals`
`722`	`722`	`// all units once per frame instead of once per frame per Tunnel Network.`
`723`	`723`	`TunnelTracker* tunnelSystem = getTunnelSystem();`
Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ UpdateSleepTime TunnelContain::update( void )`
`539`	`539`	`if (controllingPlayer)`
`540`	`540`	`{`
`541`	`541`	`TunnelTracker *tunnelSystem = controllingPlayer->getTunnelSystem();`
`542`		`-#if RETAIL_COMPATIBLE_CRC`
	`542`	`+#if RETAIL_COMPATIBLE_BUG \|\| RETAIL_COMPATIBLE_CRC`
`543`	`543`	`if (tunnelSystem)`
`544`	`544`	`{`
`545`	`545`	`const TunnelContainModuleData* modData = getTunnelContainModuleData();`