More opt

Author: xezon

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp

@@ -410,9 +410,12 @@ void ParkingPlaceBehavior::calcPPInfo( ObjectID id, PPInfo *info )
 
 		for (std::vector<RunwayInfo>::iterator it = m_runways.begin(); it != m_runways.end(); ++it)
 		{
-			if (it->m_inUseBy == id && it->m_wasInLine)
+			if (it->m_inUseBy == id)
 			{
-				info->runwayStart = info->runwayPrep;
+				if (it->m_wasInLine)
+				{
+					info->runwayStart = info->runwayPrep;
+				}
 				break;
 			}
 		}
@@ -463,11 +466,14 @@ void ParkingPlaceBehavior::transferRunwayReservationToNextInLineForTakeoff(Objec
 	purgeDead();
 	for (std::vector<RunwayInfo>::iterator it = m_runways.begin(); it != m_runways.end(); ++it)
 	{
-		if (it->m_inUseBy == id && it->m_nextInLineForTakeoff != INVALID_ID)
+		if (it->m_inUseBy == id)
 		{
-			it->m_inUseBy = it->m_nextInLineForTakeoff;
-			it->m_wasInLine = true;
-			it->m_nextInLineForTakeoff = INVALID_ID;
+			if (it->m_nextInLineForTakeoff != INVALID_ID)
+			{
+				it->m_inUseBy = it->m_nextInLineForTakeoff;
+				it->m_wasInLine = true;
+				it->m_nextInLineForTakeoff = INVALID_ID;
+			}
 			break;
 		}
 	}