chore(compat): guard patriot assist fix behind CRC compatibility flag

bobtista · bobtista · commit c625ff875538 · 2025-12-21T18:37:22.000-05:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -3286,8 +3286,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 
 	if (!victim)
 	{
+#if !RETAIL_COMPATIBLE_CRC
 		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
 		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
+#endif
 		// Hard to kill em if they're already dead.  jba
 		return;
 	}
@@ -3307,8 +3309,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 {
 	if (!victim) {
+#if !RETAIL_COMPATIBLE_CRC
 		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
 		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
+#endif
 		return;
 	}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
@@ -2756,9 +2756,11 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
 	if( requestOf == requestData->m_requestingObject )
 		return;
 
+#if !RETAIL_COMPATIBLE_CRC
 	// TheSuperHackers @bugfix bobtista Prevent patriot from assisting when it is the target
 	if( requestOf == requestData->m_victimObject )
 		return;
+#endif
 
 	// Only request of our kind of people
 	if( !requestOf->getTemplate()->isEquivalentTo( requestData->m_requestingObject->getTemplate() ) )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -3423,8 +3423,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 
 	if (!victim)
 	{
+#if !RETAIL_COMPATIBLE_CRC
 		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
 		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
+#endif
 		// Hard to kill em if they're already dead.  jba
 		return;
 	}
@@ -3444,8 +3446,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 {
 	if (!victim) {
+#if !RETAIL_COMPATIBLE_CRC
 		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
 		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
+#endif
 		return;
 	}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
@@ -2967,9 +2967,11 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
 	if( requestOf == requestData->m_requestingObject )
 		return;
 
+#if !RETAIL_COMPATIBLE_CRC
 	// TheSuperHackers @bugfix bobtista Prevent patriot from assisting when it is the target
 	if( requestOf == requestData->m_victimObject )
 		return;
+#endif
 
 	// Only request of our kind of people
 	if( !requestOf->getTemplate()->isEquivalentTo( requestData->m_requestingObject->getTemplate() ) )

Original file line number	Diff line number	Diff line change
`@@ -3286,8 +3286,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,`
`3286`	`3286`
`3287`	`3287`	`if (!victim)`
`3288`	`3288`	`{`
	`3289`	`+#if !RETAIL_COMPATIBLE_CRC`
`3289`	`3290`	`// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug`
`3290`	`3291`	`getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);`
	`3292`	`+#endif`
`3291`	`3293`	`// Hard to kill em if they're already dead. jba`
`3292`	`3294`	`return;`
`3293`	`3295`	`}`
`@@ -3307,8 +3309,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,`
`3307`	`3309`	`void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )`
`3308`	`3310`	`{`
`3309`	`3311`	`if (!victim) {`
	`3312`	`+#if !RETAIL_COMPATIBLE_CRC`
`3310`	`3313`	`// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug`
`3311`	`3314`	`getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);`
	`3315`	`+#endif`
`3312`	`3316`	`return;`
`3313`	`3317`	`}`
`3314`	`3318`
Original file line number	Diff line number	Diff line change
`@@ -3423,8 +3423,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,`
`3423`	`3423`
`3424`	`3424`	`if (!victim)`
`3425`	`3425`	`{`
	`3426`	`+#if !RETAIL_COMPATIBLE_CRC`
`3426`	`3427`	`// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug`
`3427`	`3428`	`getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);`
	`3429`	`+#endif`
`3428`	`3430`	`// Hard to kill em if they're already dead. jba`
`3429`	`3431`	`return;`
`3430`	`3432`	`}`
`@@ -3444,8 +3446,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,`
`3444`	`3446`	`void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )`
`3445`	`3447`	`{`
`3446`	`3448`	`if (!victim) {`
	`3449`	`+#if !RETAIL_COMPATIBLE_CRC`
`3447`	`3450`	`// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug`
`3448`	`3451`	`getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);`
	`3452`	`+#endif`
`3449`	`3453`	`return;`
`3450`	`3454`	`}`
`3451`	`3455`