@@ -1349,21 +1349,16 @@ class JetPauseBeforeTakeoffState : public AIFaceState
1349
1349
1350
1350
// always call this.
1351
1351
StateReturnType superStatus = AIFaceState::update ();
1352
- UnsignedInt now = TheGameLogic->getFrame ();
1353
-
1354
- #if !RETAIL_COMPATIBLE_CRC
1355
- if (m_resetTimer && now >= m_whenTransfer)
1356
- {
1357
- // once we start the final wait, release the runways for guys behind us, so they can start taxiing
1358
- ParkingPlaceBehaviorInterface* pp = getPP (jet->getProducerID ());
1359
- if (pp)
1360
- pp->transferRunwayReservationToNextInLineForTakeoff (jet->getID ());
1361
- }
1362
- #endif
1363
1352
1353
+ #if RETAIL_COMPATIBLE_CRC
1364
1354
if (findWaiter ())
1365
1355
return STATE_CONTINUE;
1356
+ #else
1357
+ if (!m_resetTimer && findWaiter ())
1358
+ return STATE_CONTINUE;
1359
+ #endif
1366
1360
1361
+ UnsignedInt now = TheGameLogic->getFrame ();
1367
1362
if (!m_resetTimer)
1368
1363
{
1369
1364
// we had to wait, but now everyone else is ready, so restart our countdown.
@@ -1389,14 +1384,12 @@ class JetPauseBeforeTakeoffState : public AIFaceState
1389
1384
DEBUG_ASSERTCRASH (m_when != 0 , (" hmm" ));
1390
1385
DEBUG_ASSERTCRASH (m_whenTransfer != 0 , (" hmm" ));
1391
1386
1392
- #if RETAIL_COMPATIBLE_CRC
1393
- // once we start the final wait, release the runways for guys behind us, so they can start taxiing
1387
+ // once we start the final wait, release the runways for guys behind us, so they can start taxiing
1394
1388
ParkingPlaceBehaviorInterface* pp = getPP (jet->getProducerID ());
1395
1389
if (pp && now >= m_whenTransfer)
1396
1390
{
1397
1391
pp->transferRunwayReservationToNextInLineForTakeoff (jet->getID ());
1398
1392
}
1399
- #endif
1400
1393
1401
1394
if (now >= m_when)
1402
1395
return superStatus;
0 commit comments