equal
deleted
inserted
replaced
734 case OT_LOADING: { |
734 case OT_LOADING: { |
735 Order b; |
735 Order b; |
736 |
736 |
737 if (--v->load_unload_time_rem != 0) return; |
737 if (--v->load_unload_time_rem != 0) return; |
738 |
738 |
739 if (v->current_order.flags & OF_FULL_LOAD && CanFillVehicle(v)) { |
739 if (CanFillVehicle(v) && (v->current_order.flags & OF_FULL_LOAD || |
|
740 (_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED)))) { |
740 SET_EXPENSES_TYPE(EXPENSES_ROADVEH_INC); |
741 SET_EXPENSES_TYPE(EXPENSES_ROADVEH_INC); |
741 if (LoadUnloadVehicle(v)) { |
742 if (LoadUnloadVehicle(v, false)) { |
742 InvalidateWindow(WC_ROADVEH_LIST, v->owner); |
743 InvalidateWindow(WC_ROADVEH_LIST, v->owner); |
743 MarkRoadVehDirty(v); |
744 MarkRoadVehDirty(v); |
744 } |
745 } |
745 return; |
746 return; |
746 } |
747 } |
1511 v->current_order.flags = |
1512 v->current_order.flags = |
1512 (old_order.flags & (OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER)) | OF_NON_STOP; |
1513 (old_order.flags & (OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER)) | OF_NON_STOP; |
1513 } |
1514 } |
1514 |
1515 |
1515 SET_EXPENSES_TYPE(EXPENSES_ROADVEH_INC); |
1516 SET_EXPENSES_TYPE(EXPENSES_ROADVEH_INC); |
1516 if (LoadUnloadVehicle(v)) { |
1517 if (LoadUnloadVehicle(v, true)) { |
1517 InvalidateWindow(WC_ROADVEH_LIST, v->owner); |
1518 InvalidateWindow(WC_ROADVEH_LIST, v->owner); |
1518 MarkRoadVehDirty(v); |
1519 MarkRoadVehDirty(v); |
1519 } |
1520 } |
1520 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
1521 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
1521 return; |
1522 return; |