equal
deleted
inserted
replaced
1587 return false; |
1587 return false; |
1588 } |
1588 } |
1589 |
1589 |
1590 if (v->current_order.type == OT_GOTO_DEPOT && |
1590 if (v->current_order.type == OT_GOTO_DEPOT && |
1591 (v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) && |
1591 (v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) && |
1592 SERVICE_INTERVAL) { |
1592 !VehicleNeedsService(v)) { |
1593 v->cur_order_index++; |
1593 v->cur_order_index++; |
1594 } |
1594 } |
1595 |
1595 |
1596 // check if we've reached the waypoint? |
1596 // check if we've reached the waypoint? |
1597 if (v->current_order.type == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) { |
1597 if (v->current_order.type == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) { |
2595 TrainFindDepotData tfdd; |
2595 TrainFindDepotData tfdd; |
2596 |
2596 |
2597 if (_patches.servint_trains == 0) |
2597 if (_patches.servint_trains == 0) |
2598 return; |
2598 return; |
2599 |
2599 |
2600 if (SERVICE_INTERVAL) |
2600 if (!VehicleNeedsService(v)) |
2601 return; |
2601 return; |
2602 |
2602 |
2603 if (v->vehstatus & VS_STOPPED) |
2603 if (v->vehstatus & VS_STOPPED) |
2604 return; |
2604 return; |
2605 |
2605 |