equal
deleted
inserted
replaced
1629 v->u.air.state = HANGAR; |
1629 v->u.air.state = HANGAR; |
1630 } else { |
1630 } else { |
1631 v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF; |
1631 v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF; |
1632 } |
1632 } |
1633 break; |
1633 break; |
|
1634 case OT_CONDITIONAL: |
|
1635 /* In case of a conditional order we just have to wait a tick |
|
1636 * longer, so the conditional order can actually be processed; |
|
1637 * we should not clear the order as that makes us go nowhere. */ |
|
1638 return; |
1634 default: // orders have been deleted (no orders), goto depot and don't bother us |
1639 default: // orders have been deleted (no orders), goto depot and don't bother us |
1635 v->current_order.Free(); |
1640 v->current_order.Free(); |
1636 v->u.air.state = HANGAR; |
1641 v->u.air.state = HANGAR; |
1637 } |
1642 } |
1638 AirportMove(v, apc); |
1643 AirportMove(v, apc); |