equal
deleted
inserted
replaced
625 /* We got within 3 tiles of our target buoy, so let's skip to our |
625 /* We got within 3 tiles of our target buoy, so let's skip to our |
626 * next order */ |
626 * next order */ |
627 UpdateVehicleTimetable(v, true); |
627 UpdateVehicleTimetable(v, true); |
628 v->cur_order_index++; |
628 v->cur_order_index++; |
629 v->current_order.MakeDummy(); |
629 v->current_order.MakeDummy(); |
630 InvalidateVehicleOrder(v); |
630 InvalidateVehicleOrder(v, 0); |
631 } else { |
631 } else { |
632 /* Non-buoy orders really need to reach the tile */ |
632 /* Non-buoy orders really need to reach the tile */ |
633 if (v->dest_tile == gp.new_tile) { |
633 if (v->dest_tile == gp.new_tile) { |
634 if (v->current_order.IsType(OT_GOTO_DEPOT)) { |
634 if (v->current_order.IsType(OT_GOTO_DEPOT)) { |
635 if ((gp.x & 0xF) == 8 && (gp.y & 0xF) == 8) { |
635 if ((gp.x & 0xF) == 8 && (gp.y & 0xF) == 8) { |
645 ShipArrivesAt(v, st); |
645 ShipArrivesAt(v, st); |
646 v->BeginLoading(); |
646 v->BeginLoading(); |
647 } else { // leave stations without docks right aways |
647 } else { // leave stations without docks right aways |
648 v->current_order.MakeLeaveStation(); |
648 v->current_order.MakeLeaveStation(); |
649 v->cur_order_index++; |
649 v->cur_order_index++; |
650 InvalidateVehicleOrder(v); |
650 InvalidateVehicleOrder(v, 0); |
651 } |
651 } |
652 } |
652 } |
653 } |
653 } |
654 } |
654 } |
655 } |
655 } |