bugfix(collide): Prevent retail CRC mismatch from changes to Sabotage Crate Collide (#1571)

xezon · web-flow · commit d61ce1fa6890 · 2025-09-13T20:40:56.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp
@@ -97,11 +97,13 @@ Bool SabotageCommandCenterCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp
@@ -92,11 +92,13 @@ Bool SabotageFakeBuildingCrateCollide::isValidToExecute( const Object *other ) c
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp
@@ -98,11 +98,13 @@ Bool SabotageInternetCenterCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp
@@ -102,11 +102,13 @@ Bool SabotageMilitaryFactoryCrateCollide::isValidToExecute( const Object *other
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp
@@ -92,11 +92,13 @@ Bool SabotagePowerPlantCrateCollide::isValidToExecute( const Object *other ) con
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp
@@ -97,11 +97,13 @@ Bool SabotageSuperweaponCrateCollide::isValidToExecute( const Object *other ) co
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp
@@ -96,11 +96,13 @@ Bool SabotageSupplyCenterCrateCollide::isValidToExecute( const Object *other ) c
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp
@@ -96,11 +96,13 @@ Bool SabotageSupplyDropzoneCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
 	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
 	{
 		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
 		return FALSE;
 	}
+#endif
 
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )

Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,13 @@ Bool SabotageCommandCenterCrateCollide::isValidToExecute( const Object *other )`
`97`	`97`	`return FALSE;`
`98`	`98`	`}`
`99`	`99`
	`100`	`+#if !RETAIL_COMPATIBLE_CRC`
`100`	`101`	`if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
`101`	`102`	`{`
`102`	`103`	`// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
`103`	`104`	`return FALSE;`
`104`	`105`	`}`
	`106`	`+#endif`
`105`	`107`
`106`	`108`	`Relationship r = getObject()->getRelationship( other );`
`107`	`109`	`if( r != ENEMIES )`
Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,13 @@ Bool SabotageFakeBuildingCrateCollide::isValidToExecute( const Object *other ) c`
`92`	`92`	`return FALSE;`
`93`	`93`	`}`
`94`	`94`
	`95`	`+#if !RETAIL_COMPATIBLE_CRC`
`95`	`96`	`if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
`96`	`97`	`{`
`97`	`98`	`// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
`98`	`99`	`return FALSE;`
`99`	`100`	`}`
	`101`	`+#endif`
`100`	`102`
`101`	`103`	`Relationship r = getObject()->getRelationship( other );`
`102`	`104`	`if( r != ENEMIES )`
Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,13 @@ Bool SabotageInternetCenterCrateCollide::isValidToExecute( const Object *other )`
`98`	`98`	`return FALSE;`
`99`	`99`	`}`
`100`	`100`
	`101`	`+#if !RETAIL_COMPATIBLE_CRC`
`101`	`102`	`if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
`102`	`103`	`{`
`103`	`104`	`// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
`104`	`105`	`return FALSE;`
`105`	`106`	`}`
	`107`	`+#endif`
`106`	`108`
`107`	`109`	`Relationship r = getObject()->getRelationship( other );`
`108`	`110`	`if( r != ENEMIES )`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,13 @@ Bool SabotageMilitaryFactoryCrateCollide::isValidToExecute( const Object *other`
`102`	`102`	`return FALSE;`
`103`	`103`	`}`
`104`	`104`
	`105`	`+#if !RETAIL_COMPATIBLE_CRC`
`105`	`106`	`if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
`106`	`107`	`{`
`107`	`108`	`// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
`108`	`109`	`return FALSE;`
`109`	`110`	`}`
	`111`	`+#endif`
`110`	`112`
`111`	`113`	`Relationship r = getObject()->getRelationship( other );`
`112`	`114`	`if( r != ENEMIES )`
Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,13 @@ Bool SabotagePowerPlantCrateCollide::isValidToExecute( const Object *other ) con`
`92`	`92`	`return FALSE;`
`93`	`93`	`}`
`94`	`94`
	`95`	`+#if !RETAIL_COMPATIBLE_CRC`
`95`	`96`	`if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
`96`	`97`	`{`
`97`	`98`	`// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
`98`	`99`	`return FALSE;`
`99`	`100`	`}`
	`101`	`+#endif`
`100`	`102`
`101`	`103`	`Relationship r = getObject()->getRelationship( other );`
`102`	`104`	`if( r != ENEMIES )`
Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,13 @@ Bool SabotageSuperweaponCrateCollide::isValidToExecute( const Object *other ) co`
`97`	`97`	`return FALSE;`
`98`	`98`	`}`
`99`	`99`
	`100`	`+#if !RETAIL_COMPATIBLE_CRC`
`100`	`101`	`if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
`101`	`102`	`{`
`102`	`103`	`// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
`103`	`104`	`return FALSE;`
`104`	`105`	`}`
	`106`	`+#endif`
`105`	`107`
`106`	`108`	`Relationship r = getObject()->getRelationship( other );`
`107`	`109`	`if( r != ENEMIES )`
Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,13 @@ Bool SabotageSupplyCenterCrateCollide::isValidToExecute( const Object *other ) c`
`96`	`96`	`return FALSE;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+#if !RETAIL_COMPATIBLE_CRC`
`99`	`100`	`if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))`
`100`	`101`	`{`
`101`	`102`	`// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.`
`102`	`103`	`return FALSE;`
`103`	`104`	`}`
	`105`	`+#endif`
`104`	`106`
`105`	`107`	`Relationship r = getObject()->getRelationship( other );`
`106`	`108`	`if( r != ENEMIES )`