bugfix: Chinooks no longer get stuck when performing Combat Drops into buildings above terrain height

Author: Stubbjax

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

@@ -360,7 +360,11 @@ class ChinookCombatDropState : public State
 			for (std::list<ObjectID>::iterator oit = it->rappellerIDs.begin(); oit != it->rappellerIDs.end(); )
 			{
 				Object* rappeller = TheGameLogic->findObjectByID(*oit);
+#if RETAIL_COMPATIBLE_CRC
 				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain())
+#else
+				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain() || rappeller->isContained())
+#endif
 				{
 					oit = it->rappellerIDs.erase(oit);
 				}

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

@@ -361,7 +361,11 @@ class ChinookCombatDropState : public State
 			for (std::list<ObjectID>::iterator oit = it->rappellerIDs.begin(); oit != it->rappellerIDs.end(); )
 			{
 				Object* rappeller = TheGameLogic->findObjectByID(*oit);
+#if RETAIL_COMPATIBLE_CRC
 				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain())
+#else
+				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain() || rappeller->isContained())
+#endif
 				{
 					oit = it->rappellerIDs.erase(oit);
 				}