equal
deleted
inserted
replaced
1580 if ((v->next_order & (OT_MASK|OF_UNLOAD|OF_FULL_LOAD)) == (OT_GOTO_DEPOT|OF_UNLOAD|OF_FULL_LOAD) && |
1580 if ((v->next_order & (OT_MASK|OF_UNLOAD|OF_FULL_LOAD)) == (OT_GOTO_DEPOT|OF_UNLOAD|OF_FULL_LOAD) && |
1581 SERVICE_INTERVAL) { |
1581 SERVICE_INTERVAL) { |
1582 v->cur_order_index++; |
1582 v->cur_order_index++; |
1583 } |
1583 } |
1584 |
1584 |
1585 // check if we've reached the checkpoint? |
1585 // check if we've reached the waypoint? |
1586 if ((v->next_order & OT_MASK) == OT_GOTO_CHECKPOINT && v->tile == v->dest_tile) { |
1586 if ((v->next_order & OT_MASK) == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) { |
1587 v->cur_order_index++; |
1587 v->cur_order_index++; |
1588 } |
1588 } |
1589 |
1589 |
1590 // check if we've reached a non-stop station while TTDPatch nonstop is enabled.. |
1590 // check if we've reached a non-stop station while TTDPatch nonstop is enabled.. |
1591 if (_patches.new_nonstop && (v->next_order & OF_NON_STOP) && v->next_order_param == _map2[v->tile]) { |
1591 if (_patches.new_nonstop && (v->next_order & OF_NON_STOP) && v->next_order_param == _map2[v->tile]) { |
1621 v->dest_tile = DEREF_STATION(order >> 8)->xy; |
1621 v->dest_tile = DEREF_STATION(order >> 8)->xy; |
1622 result = CheckReverseTrain(v); |
1622 result = CheckReverseTrain(v); |
1623 } else if ((order & OT_MASK) == OT_GOTO_DEPOT) { |
1623 } else if ((order & OT_MASK) == OT_GOTO_DEPOT) { |
1624 v->dest_tile = _depots[order >> 8].xy; |
1624 v->dest_tile = _depots[order >> 8].xy; |
1625 result = CheckReverseTrain(v); |
1625 result = CheckReverseTrain(v); |
1626 } else if ((order & OT_MASK) == OT_GOTO_CHECKPOINT) { |
1626 } else if ((order & OT_MASK) == OT_GOTO_WAYPOINT) { |
1627 v->dest_tile = _checkpoints[order >> 8].xy; |
1627 v->dest_tile = _waypoints[order >> 8].xy; |
1628 result = CheckReverseTrain(v); |
1628 result = CheckReverseTrain(v); |
1629 } |
1629 } |
1630 |
1630 |
1631 InvalidateVehicleOrderWidget(v); |
1631 InvalidateVehicleOrderWidget(v); |
1632 |
1632 |