bugfix: Chinooks and Helixes now correctly wait for their passengers to disembark

Stubbjax · Stubbjax · commit efcf500a1331 · 2025-11-04T15:09:14.000+11: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
@@ -1166,7 +1166,11 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 				setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI);
 				passItThru = false;
 			}
+#if RETAIL_COMPATIBLE_CRC
 			else
+#else
+			else if (getObject()->getContain() && getObject()->getContain()->hasObjectsWantingToEnterOrExit())
+#endif
 			{
 				// do this INSTEAD of the standard stuff
 				setMyState(
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -1301,7 +1301,11 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 				setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI);
 				passItThru = false;
 			}
+#if RETAIL_COMPATIBLE_CRC
 			else
+#else
+			else if (getObject()->getContain() && getObject()->getContain()->hasObjectsWantingToEnterOrExit())
+#endif
 			{
 				// do this INSTEAD of the standard stuff
 				setMyState(

Original file line number	Diff line number	Diff line change
`@@ -1166,7 +1166,11 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)`
`1166`	`1166`	`setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI);`
`1167`	`1167`	`passItThru = false;`
`1168`	`1168`	`}`
	`1169`	`+#if RETAIL_COMPATIBLE_CRC`
`1169`	`1170`	`else`
	`1171`	`+#else`
	`1172`	`+ else if (getObject()->getContain() && getObject()->getContain()->hasObjectsWantingToEnterOrExit())`
	`1173`	`+#endif`
`1170`	`1174`	`{`
`1171`	`1175`	`// do this INSTEAD of the standard stuff`
`1172`	`1176`	`setMyState(`
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,11 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)`
`1301`	`1301`	`setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI);`
`1302`	`1302`	`passItThru = false;`
`1303`	`1303`	`}`
	`1304`	`+#if RETAIL_COMPATIBLE_CRC`
`1304`	`1305`	`else`
	`1306`	`+#else`
	`1307`	`+ else if (getObject()->getContain() && getObject()->getContain()->hasObjectsWantingToEnterOrExit())`
	`1308`	`+#endif`
`1305`	`1309`	`{`
`1306`	`1310`	`// do this INSTEAD of the standard stuff`
`1307`	`1311`	`setMyState(`