bugfix: Make healed helicopters follow airfield rally point

Signed-off-by: tintinhamans <5984296+tintinhamans@users.noreply.github.com>

Author: tintinhamans

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

@@ -1031,6 +1031,23 @@ UpdateSleepTime ChinookAIUpdate::update()
 		{
 			// we're completely healed, so take off again
 			pp->setHealee(getObject(), false);
+
+			// TheSuperHackers @bugfix arcticdolphin 08/02/2026 Move healed Chinook to rally point if present.
+#if !RETAIL_COMPATIBLE_CRC
+			{
+				Object *airfield = TheGameLogic->findObjectByID( m_airfieldForHealing );
+				ExitInterface *exitInterface = airfield ? airfield->getObjectExitInterface() : nullptr;
+				const Coord3D *rp = exitInterface ? exitInterface->getRallyPoint() : nullptr;
+				if( rp )
+				{
+					AICommandParms parms( AICMD_MOVE_TO_POSITION, CMD_FROM_AI );
+					parms.m_pos = *rp;
+					m_pendingCommand.store( parms );
+					m_hasPendingCommand = true;
+				}
+			}
+#endif
+
 			setMyState(TAKING_OFF, nullptr, nullptr, CMD_FROM_AI);
 		}
 		else

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

@@ -1775,6 +1775,23 @@ UpdateSleepTime JetAIUpdate::update()
 				friend_setAllowAirLoco(true);
 				getStateMachine()->clear();
 				setLastCommandSource( CMD_FROM_AI );
+
+				// TheSuperHackers @bugfix arcticdolphin 08/02/2026 Move healed helicopter to rally point if present.
+#if !RETAIL_COMPATIBLE_CRC
+				{
+					Object *airfield = TheGameLogic->findObjectByID( jet->getProducerID() );
+					ExitInterface *exitInterface = airfield ? airfield->getObjectExitInterface() : nullptr;
+					const Coord3D *rp = exitInterface ? exitInterface->getRallyPoint() : nullptr;
+					if( rp )
+					{
+						AICommandParms parms( AICMD_MOVE_TO_POSITION, CMD_FROM_AI );
+						parms.m_pos = *rp;
+						m_mostRecentCommand.store( parms );
+						setFlag(HAS_PENDING_COMMAND, true);
+					}
+				}
+#endif
+
 				getStateMachine()->setState( TAKING_OFF_AWAIT_CLEARANCE );
 			}
 			else

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

@@ -1093,6 +1093,23 @@ UpdateSleepTime ChinookAIUpdate::update()
 		{
 			// we're completely healed, so take off again
 			pp->setHealee(getObject(), false);
+
+			// TheSuperHackers @bugfix arcticdolphin 08/02/2026 Move healed Chinook to rally point if present.
+#if !RETAIL_COMPATIBLE_CRC
+			{
+				Object *airfield = TheGameLogic->findObjectByID( m_airfieldForHealing );
+				ExitInterface *exitInterface = airfield ? airfield->getObjectExitInterface() : nullptr;
+				const Coord3D *rp = exitInterface ? exitInterface->getRallyPoint() : nullptr;
+				if( rp )
+				{
+					AICommandParms parms( AICMD_MOVE_TO_POSITION, CMD_FROM_AI );
+					parms.m_pos = *rp;
+					m_pendingCommand.store( parms );
+					m_hasPendingCommand = true;
+				}
+			}
+#endif
+
 			setMyState(TAKING_OFF, nullptr, nullptr, CMD_FROM_AI);
 		}
 		else

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

@@ -1347,7 +1347,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 
 				if (ai->getCurrentStateID() != TAXI_TO_TAKEOFF)
 					continue;
-				
+
 				return otherJet;
 			}
 		}
@@ -1997,6 +1997,23 @@ UpdateSleepTime JetAIUpdate::update()
 				friend_setAllowAirLoco(true);
 				getStateMachine()->clear();
 				setLastCommandSource( CMD_FROM_AI );
+
+				// TheSuperHackers @bugfix arcticdolphin 08/02/2026 Move healed helicopter to rally point if present.
+#if !RETAIL_COMPATIBLE_CRC
+				{
+					Object *airfield = TheGameLogic->findObjectByID( jet->getProducerID() );
+					ExitInterface *exitInterface = airfield ? airfield->getObjectExitInterface() : nullptr;
+					const Coord3D *rp = exitInterface ? exitInterface->getRallyPoint() : nullptr;
+					if( rp )
+					{
+						AICommandParms parms( AICMD_MOVE_TO_POSITION, CMD_FROM_AI );
+						parms.m_pos = *rp;
+						m_mostRecentCommand.store( parms );
+						setFlag(HAS_PENDING_COMMAND, true);
+					}
+				}
+#endif
+
 				getStateMachine()->setState( TAKING_OFF_AWAIT_CLEARANCE );
 			}
 			else