refactor: Add convenience function to determine whether to defer commands

Author: Stubbjax

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

@@ -131,6 +131,7 @@ class JetAIUpdate : public AIUpdateInterface
 	void positionLockon();
 
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
+	virtual Bool shouldDeferCommand(const AICommandType commandType) const; ///< returns whether the specified command type should be deferred
 	Bool isParkedAt(const Object* obj) const;
 
 private:

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

@@ -2316,18 +2316,8 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 	// note that we always store this, even if nothing will be "pending".
 	m_mostRecentCommand.store(*parms);
 
-	if (getFlag(TAKEOFF_IN_PROGRESS) || getFlag(LANDING_IN_PROGRESS))
+	if (shouldDeferCommand(parms->m_cmd))
 	{
-		// have to wait for takeoff or landing to complete, just store the sucker
-		setFlag(HAS_PENDING_COMMAND, true);
-		return;
-	}
-
-	if (parms->m_cmd == AICMD_IDLE && getStateMachine()->getCurrentStateID() == RELOAD_AMMO)
-	{
-		// uber-special-case... if we are told to idle, but are reloading ammo, ignore it for now,
-		// since we're already doing "nothing" and responding to this will cease our reload...
-		// don't just return, tho, in case we were (say) reloading during a guard stint.
 		setFlag(HAS_PENDING_COMMAND, true);
 		return;
 	}
@@ -2383,6 +2373,24 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 	AIUpdateInterface::aiDoCommand(parms);
 }
 
+//-------------------------------------------------------------------------------------------------
+Bool JetAIUpdate::shouldDeferCommand(const AICommandType commandType) const
+{
+	// Always defer commands received during takeoff or landing
+	if (getFlag(TAKEOFF_IN_PROGRESS) || getFlag(LANDING_IN_PROGRESS))
+		return true;
+
+	const StateID currentState = getStateMachine()->getCurrentStateID();
+
+	// uber-special-case... if we are told to idle, but are reloading ammo, ignore it for now,
+	// since we're already doing "nothing" and responding to this will cease our reload...
+	// don't just return, tho, in case we were (say) reloading during a guard stint.
+	if (commandType == AICMD_IDLE && currentState == RELOAD_AMMO)
+		return true;
+
+	return false;
+}
+
 //-------------------------------------------------------------------------------------------------
 void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco)
 {

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

@@ -140,6 +140,7 @@ class JetAIUpdate : public AIUpdateInterface
 	void positionLockon();
 
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
+	virtual Bool shouldDeferCommand(const AICommandType commandType) const; ///< returns whether the specified command type should be deferred
 	Bool isParkedAt(const Object* obj) const;
 
 private:

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

@@ -2543,18 +2543,8 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 	// note that we always store this, even if nothing will be "pending".
 	m_mostRecentCommand.store(*parms);
 
-	if (getFlag(TAKEOFF_IN_PROGRESS) || getFlag(LANDING_IN_PROGRESS))
+	if (shouldDeferCommand(parms->m_cmd))
 	{
-		// have to wait for takeoff or landing to complete, just store the sucker
-		setFlag(HAS_PENDING_COMMAND, true);
-		return;
-	}
-
-	if (parms->m_cmd == AICMD_IDLE && getStateMachine()->getCurrentStateID() == RELOAD_AMMO)
-	{
-		// uber-special-case... if we are told to idle, but are reloading ammo, ignore it for now,
-		// since we're already doing "nothing" and responding to this will cease our reload...
-		// don't just return, tho, in case we were (say) reloading during a guard stint.
 		setFlag(HAS_PENDING_COMMAND, true);
 		return;
 	}
@@ -2619,6 +2609,24 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 	AIUpdateInterface::aiDoCommand(parms);
 }
 
+//-------------------------------------------------------------------------------------------------
+Bool JetAIUpdate::shouldDeferCommand(const AICommandType commandType) const
+{
+	// Always defer commands received during takeoff or landing
+	if (getFlag(TAKEOFF_IN_PROGRESS) || getFlag(LANDING_IN_PROGRESS))
+		return true;
+
+	const StateID currentState = getStateMachine()->getCurrentStateID();
+
+	// uber-special-case... if we are told to idle, but are reloading ammo, ignore it for now,
+	// since we're already doing "nothing" and responding to this will cease our reload...
+	// don't just return, tho, in case we were (say) reloading during a guard stint.
+	if (commandType == AICMD_IDLE && currentState == RELOAD_AMMO)
+		return true;
+
+	return false;
+}
+
 //-------------------------------------------------------------------------------------------------
 void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco)
 {