bugfix: Defer commands that require ammo during reload

Author: Stubbjax

Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h

@@ -133,6 +133,7 @@ class JetAIUpdate : public AIUpdateInterface
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
 	virtual Bool shouldDeferCommand(const AICommandType commandType) const; ///< returns whether the specified command type should be deferred
 	virtual Bool commandRequiresTakeoff(const AICommandParms* parms) const; ///< returns whether the specified command requires takeoff
+	virtual Bool commandRequiresAmmo(const AICommandType commandType) const; ///< returns whether the specified command type requires ammo
 	virtual Bool isGuardCommand(const AICommandType commandType) const; ///< returns whether the specified command type is a guard command
 	Bool isParkedAt(const Object* obj) const;
 

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

@@ -2355,7 +2355,7 @@ Bool JetAIUpdate::shouldDeferCommand(const AICommandType commandType) const
 		return true;
 
 #if !RETAIL_COMPATIBLE_CRC
-	if (isGuardCommand(commandType) && currentState == RELOAD_AMMO)
+	if (commandRequiresAmmo(commandType) && currentState == RELOAD_AMMO)
 		return true;
 #endif
 
@@ -2382,6 +2382,22 @@ Bool JetAIUpdate::commandRequiresTakeoff(const AICommandParms* parms) const
 	}
 }
 
+Bool JetAIUpdate::commandRequiresAmmo(const AICommandType commandType) const
+{
+	switch (commandType)
+	{
+		case AICMD_ATTACKMOVE_TO_POSITION:
+		case AICMD_ATTACK_AREA:
+		case AICMD_ATTACK_OBJECT:
+		case AICMD_ATTACK_POSITION:
+		case AICMD_ATTACK_TEAM:
+		case AICMD_FORCE_ATTACK_OBJECT:
+			return true;
+		default:
+			return isGuardCommand(commandType);
+	}
+}
+
 Bool JetAIUpdate::isGuardCommand(const AICommandType commandType) const
 {
 	switch (commandType)

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h

@@ -142,6 +142,7 @@ class JetAIUpdate : public AIUpdateInterface
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
 	virtual Bool shouldDeferCommand(const AICommandType commandType) const; ///< returns whether the specified command type should be deferred
 	virtual Bool commandRequiresTakeoff(const AICommandParms* parms) const; ///< returns whether the specified command requires takeoff
+	virtual Bool commandRequiresAmmo(const AICommandType commandType) const; ///< returns whether the specified command type requires ammo
 	virtual Bool isGuardCommand(const AICommandType commandType) const; ///< returns whether the specified command type is a guard command
 	Bool isParkedAt(const Object* obj) const;
 

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

@@ -2590,7 +2590,7 @@ Bool JetAIUpdate::shouldDeferCommand(const AICommandType commandType) const
 		return true;
 
 #if !RETAIL_COMPATIBLE_CRC
-	if (isGuardCommand(commandType) && currentState == RELOAD_AMMO)
+	if (commandRequiresAmmo(commandType) && currentState == RELOAD_AMMO)
 		return true;
 #endif
 
@@ -2617,6 +2617,22 @@ Bool JetAIUpdate::commandRequiresTakeoff(const AICommandParms* parms) const
 	}
 }
 
+Bool JetAIUpdate::commandRequiresAmmo(const AICommandType commandType) const
+{
+	switch (commandType)
+	{
+		case AICMD_ATTACKMOVE_TO_POSITION:
+		case AICMD_ATTACK_AREA:
+		case AICMD_ATTACK_OBJECT:
+		case AICMD_ATTACK_POSITION:
+		case AICMD_ATTACK_TEAM:
+		case AICMD_FORCE_ATTACK_OBJECT:
+			return true;
+		default:
+			return isGuardCommand(commandType);
+	}
+}
+
 Bool JetAIUpdate::isGuardCommand(const AICommandType commandType) const
 {
 	switch (commandType)