bugfix(weapon): fix patriot assist system extended range bug

Author: bobtista

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp

@@ -3286,6 +3286,8 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 
 	if (!victim)
 	{
+		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
+		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
 		// Hard to kill em if they're already dead.  jba
 		return;
 	}
@@ -3305,6 +3307,8 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 {
 	if (!victim) {
+		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
+		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
 		return;
 	}
 

Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp

@@ -2746,6 +2746,10 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
 	if( requestOf == requestData->m_requestingObject )
 		return;
 
+	// TheSuperHackers @bugfix bobtista Prevent patriot from assisting when it is the target
+	if( requestOf == requestData->m_victimObject )
+		return;
+
 	// Only request of our kind of people
 	if( !requestOf->getTemplate()->isEquivalentTo( requestData->m_requestingObject->getTemplate() ) )
 		return;

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp

@@ -3427,6 +3427,8 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 
 	if (!victim)
 	{
+		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
+		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
 		// Hard to kill em if they're already dead.  jba
 		return;
 	}
@@ -3446,6 +3448,8 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 {
 	if (!victim) {
+		// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
+		getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
 		return;
 	}
 

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp

@@ -2957,6 +2957,10 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
 	if( requestOf == requestData->m_requestingObject )
 		return;
 
+	// TheSuperHackers @bugfix bobtista Prevent patriot from assisting when it is the target
+	if( requestOf == requestData->m_victimObject )
+		return;
+
 	// Only request of our kind of people
 	if( !requestOf->getTemplate()->isEquivalentTo( requestData->m_requestingObject->getTemplate() ) )
 		return;