refactor: Add convenience function to determine whether command is a guard command

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 isGuardCommand(const AICommandType commandType) const; ///< returns whether the specified command type is a guard command
 	Bool isParkedAt(const Object* obj) const;
 
 private:

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

@@ -2334,19 +2334,7 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 		return;
 	}
 
-	switch (parms->m_cmd)
-	{
-		case AICMD_GUARD_POSITION:
-		case AICMD_GUARD_OBJECT:
-		case AICMD_GUARD_AREA:
-		case AICMD_HUNT:
-			setFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD, true);
-			break;
-		default:
-			setFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD, false);
-			break;
-	}
-
+	setFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD, isGuardCommand(parms->m_cmd));
 	setFlag(HAS_PENDING_COMMAND, false);
 	AIUpdateInterface::aiDoCommand(parms);
 }
@@ -2389,6 +2377,20 @@ Bool JetAIUpdate::commandRequiresTakeoff(const AICommandParms* parms) const
 	}
 }
 
+Bool JetAIUpdate::isGuardCommand(const AICommandType commandType) const
+{
+	switch (commandType)
+	{
+		case AICMD_GUARD_AREA:
+		case AICMD_GUARD_OBJECT:
+		case AICMD_GUARD_POSITION:
+		case AICMD_HUNT:
+			return true;
+		default:
+			return false;
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco)
 {

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 isGuardCommand(const AICommandType commandType) const; ///< returns whether the specified command type is a guard command
 	Bool isParkedAt(const Object* obj) const;
 
 private:

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

@@ -2569,20 +2569,7 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 		return;
 	}
 
-	switch (parms->m_cmd)
-	{
-		case AICMD_GUARD_POSITION:
-		case AICMD_GUARD_OBJECT:
-		case AICMD_GUARD_AREA:
-		case AICMD_HUNT:
-		case AICMD_GUARD_RETALIATE:
-			setFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD, true);
-			break;
-		default:
-			setFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD, false);
-			break;
-	}
-
+	setFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD, isGuardCommand(parms->m_cmd));
 	setFlag(HAS_PENDING_COMMAND, false);
 	AIUpdateInterface::aiDoCommand(parms);
 }
@@ -2625,6 +2612,21 @@ Bool JetAIUpdate::commandRequiresTakeoff(const AICommandParms* parms) const
 	}
 }
 
+Bool JetAIUpdate::isGuardCommand(const AICommandType commandType) const
+{
+	switch (commandType)
+	{
+		case AICMD_GUARD_AREA:
+		case AICMD_GUARD_OBJECT:
+		case AICMD_GUARD_POSITION:
+		case AICMD_GUARD_RETALIATE:
+		case AICMD_HUNT:
+			return true;
+		default:
+			return false;
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco)
 {