equal
deleted
inserted
replaced
2632 v->index, |
2632 v->index, |
2633 0 |
2633 0 |
2634 ); |
2634 ); |
2635 } |
2635 } |
2636 |
2636 |
2637 /* Did we reach the final destination? */ |
2637 v->BeginLoading(); |
2638 if (v->current_order.type == OT_GOTO_STATION && |
|
2639 v->current_order.dest == station) { |
|
2640 /* Yeah, keep the load/unload flags |
|
2641 * Non Stop now means if the order should be increased. */ |
|
2642 v->BeginLoading(); |
|
2643 v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER; |
|
2644 v->current_order.flags |= OF_NON_STOP; |
|
2645 } else { |
|
2646 /* No, just do a simple load */ |
|
2647 v->BeginLoading(); |
|
2648 v->current_order.flags = 0; |
|
2649 } |
|
2650 v->current_order.dest = 0; |
2638 v->current_order.dest = 0; |
2651 |
2639 |
2652 SET_EXPENSES_TYPE(EXPENSES_TRAIN_INC); |
2640 SET_EXPENSES_TYPE(EXPENSES_TRAIN_INC); |
2653 if (LoadUnloadVehicle(v, true) != 0) { |
2641 if (LoadUnloadVehicle(v, true) != 0) { |
2654 InvalidateWindow(WC_TRAINS_LIST, v->owner); |
2642 InvalidateWindow(WC_TRAINS_LIST, v->owner); |