bugfix: Units located above the terrain can no longer teleport into airborne transports

Stubbjax · Stubbjax · commit ee4539d652c5 · 2025-11-05T01:42:31.000+11:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -6135,7 +6135,12 @@ StateReturnType AIEnterState::update()
 	StateReturnType code = AIInternalMoveToState::update();
 
 	// if it's airborne, wait for it to land
+#if RETAIL_COMPATIBLE_CRC
 	if (code == STATE_SUCCESS && goal->isAboveTerrain() && !obj->isAboveTerrain())
+#else
+	if (code == STATE_SUCCESS && (goal->getPosition()->z + goal->getGeometryInfo().getMaxHeightAbovePosition() < obj->getPosition()->z ||
+		goal->getPosition()->z > obj->getPosition()->z + obj->getGeometryInfo().getMaxHeightAbovePosition()))
+#endif
 	{
 		code = STATE_CONTINUE;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -6347,7 +6347,12 @@ StateReturnType AIEnterState::update()
 	StateReturnType code = AIInternalMoveToState::update();
 
 	// if it's airborne, wait for it to land
+#if RETAIL_COMPATIBLE_CRC
 	if (code == STATE_SUCCESS && goal->isAboveTerrain() && !obj->isAboveTerrain())
+#else
+	if (code == STATE_SUCCESS && (goal->getPosition()->z + goal->getGeometryInfo().getMaxHeightAbovePosition() < obj->getPosition()->z ||
+		goal->getPosition()->z > obj->getPosition()->z + obj->getGeometryInfo().getMaxHeightAbovePosition()))
+#endif
 	{
 		code = STATE_CONTINUE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -6135,7 +6135,12 @@ StateReturnType AIEnterState::update()`
`6135`	`6135`	`StateReturnType code = AIInternalMoveToState::update();`
`6136`	`6136`
`6137`	`6137`	`// if it's airborne, wait for it to land`
	`6138`	`+#if RETAIL_COMPATIBLE_CRC`
`6138`	`6139`	`if (code == STATE_SUCCESS && goal->isAboveTerrain() && !obj->isAboveTerrain())`
	`6140`	`+#else`
	`6141`	`+ if (code == STATE_SUCCESS && (goal->getPosition()->z + goal->getGeometryInfo().getMaxHeightAbovePosition() < obj->getPosition()->z \|\|`
	`6142`	`+ goal->getPosition()->z > obj->getPosition()->z + obj->getGeometryInfo().getMaxHeightAbovePosition()))`
	`6143`	`+#endif`
`6139`	`6144`	`{`
`6140`	`6145`	`code = STATE_CONTINUE;`
`6141`	`6146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6347,7 +6347,12 @@ StateReturnType AIEnterState::update()`
`6347`	`6347`	`StateReturnType code = AIInternalMoveToState::update();`
`6348`	`6348`
`6349`	`6349`	`// if it's airborne, wait for it to land`
	`6350`	`+#if RETAIL_COMPATIBLE_CRC`
`6350`	`6351`	`if (code == STATE_SUCCESS && goal->isAboveTerrain() && !obj->isAboveTerrain())`
	`6352`	`+#else`
	`6353`	`+ if (code == STATE_SUCCESS && (goal->getPosition()->z + goal->getGeometryInfo().getMaxHeightAbovePosition() < obj->getPosition()->z \|\|`
	`6354`	`+ goal->getPosition()->z > obj->getPosition()->z + obj->getGeometryInfo().getMaxHeightAbovePosition()))`
	`6355`	`+#endif`
`6351`	`6356`	`{`
`6352`	`6357`	`code = STATE_CONTINUE;`
`6353`	`6358`	`}`