bugfix(aiupdate): Chinooks and Helixes no longer take off after repair if passengers want to board or exit (#1787)

Stubbjax · web-flow · commit 646e3dddb681 · 2025-12-21T12:20:51.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -1002,9 +1002,16 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)
 UpdateSleepTime ChinookAIUpdate::update()
 {
 	ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);
+	const ContainModuleInterface* contain = getObject()->getContain();
+	const Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();
+
 	if (pp != NULL)
 	{
 		if (m_flightStatus == CHINOOK_LANDED &&
+#if !RETAIL_COMPATIBLE_CRC
+				// TheSuperHackers @bugfix Stubbjax 03/11/2025 Prevent Chinooks from taking off while there are still units wanting to enter or exit.
+				!waitingToEnterOrExit &&
+#endif
 				!m_hasPendingCommand &&
 				getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())
 		{
@@ -1026,10 +1033,8 @@ UpdateSleepTime ChinookAIUpdate::update()
 	// when we have a pending command...
 	if (SupplyTruckAIUpdate::isIdle())
 	{
-		ContainModuleInterface* contain = getObject()->getContain();
 		if( contain )
 		{
-			Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();
 			if (m_hasPendingCommand)
 			{
 				AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI);	// values don't matter, will be wiped by next line
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -1064,9 +1064,16 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)
 UpdateSleepTime ChinookAIUpdate::update()
 {
 	ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);
+	const ContainModuleInterface* contain = getObject()->getContain();
+	const Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();
+
 	if (pp != NULL)
 	{
 		if (m_flightStatus == CHINOOK_LANDED &&
+#if !RETAIL_COMPATIBLE_CRC
+				// TheSuperHackers @bugfix Stubbjax 03/11/2025 Prevent Chinooks from taking off while there are still units wanting to enter or exit.
+				!waitingToEnterOrExit &&
+#endif
 				!m_hasPendingCommand &&
 				getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())
 		{
@@ -1088,12 +1095,10 @@ UpdateSleepTime ChinookAIUpdate::update()
 
 	// have to call our parent's isIdle, because we override it to never return true
 	// when we have a pending command...
-	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain )
 	{
 	  if (SupplyTruckAIUpdate::isIdle())
 		{
-			Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();
 			if (m_hasPendingCommand)
 			{
 				AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI);	// values don't matter, will be wiped by next line

Original file line number	Diff line number	Diff line change
`@@ -1002,9 +1002,16 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)`
`1002`	`1002`	`UpdateSleepTime ChinookAIUpdate::update()`
`1003`	`1003`	`{`
`1004`	`1004`	`ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);`
	`1005`	`+ const ContainModuleInterface* contain = getObject()->getContain();`
	`1006`	`+ const Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();`
	`1007`	`+`
`1005`	`1008`	`if (pp != NULL)`
`1006`	`1009`	`{`
`1007`	`1010`	`if (m_flightStatus == CHINOOK_LANDED &&`
	`1011`	`+#if !RETAIL_COMPATIBLE_CRC`
	`1012`	`+ // TheSuperHackers @bugfix Stubbjax 03/11/2025 Prevent Chinooks from taking off while there are still units wanting to enter or exit.`
	`1013`	`+ !waitingToEnterOrExit &&`
	`1014`	`+#endif`
`1008`	`1015`	`!m_hasPendingCommand &&`
`1009`	`1016`	`getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())`
`1010`	`1017`	`{`
`@@ -1026,10 +1033,8 @@ UpdateSleepTime ChinookAIUpdate::update()`
`1026`	`1033`	`// when we have a pending command...`
`1027`	`1034`	`if (SupplyTruckAIUpdate::isIdle())`
`1028`	`1035`	`{`
`1029`		`- ContainModuleInterface* contain = getObject()->getContain();`
`1030`	`1036`	`if( contain )`
`1031`	`1037`	`{`
`1032`		`- Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();`
`1033`	`1038`	`if (m_hasPendingCommand)`
`1034`	`1039`	`{`
`1035`	`1040`	`AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI); // values don't matter, will be wiped by next line`
Original file line number	Diff line number	Diff line change
`@@ -1064,9 +1064,16 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)`
`1064`	`1064`	`UpdateSleepTime ChinookAIUpdate::update()`
`1065`	`1065`	`{`
`1066`	`1066`	`ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);`
	`1067`	`+ const ContainModuleInterface* contain = getObject()->getContain();`
	`1068`	`+ const Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();`
	`1069`	`+`
`1067`	`1070`	`if (pp != NULL)`
`1068`	`1071`	`{`
`1069`	`1072`	`if (m_flightStatus == CHINOOK_LANDED &&`
	`1073`	`+#if !RETAIL_COMPATIBLE_CRC`
	`1074`	`+ // TheSuperHackers @bugfix Stubbjax 03/11/2025 Prevent Chinooks from taking off while there are still units wanting to enter or exit.`
	`1075`	`+ !waitingToEnterOrExit &&`
	`1076`	`+#endif`
`1070`	`1077`	`!m_hasPendingCommand &&`
`1071`	`1078`	`getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())`
`1072`	`1079`	`{`
`@@ -1088,12 +1095,10 @@ UpdateSleepTime ChinookAIUpdate::update()`
`1088`	`1095`
`1089`	`1096`	`// have to call our parent's isIdle, because we override it to never return true`
`1090`	`1097`	`// when we have a pending command...`
`1091`		`- ContainModuleInterface* contain = getObject()->getContain();`
`1092`	`1098`	`if( contain )`
`1093`	`1099`	`{`
`1094`	`1100`	`if (SupplyTruckAIUpdate::isIdle())`
`1095`	`1101`	`{`
`1096`		`- Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();`
`1097`	`1102`	`if (m_hasPendingCommand)`
`1098`	`1103`	`{`
`1099`	`1104`	`AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI); // values don't matter, will be wiped by next line`