roadveh_cmd.c
changeset 5211 651c9272ad22
parent 5198 2547d72f2db4
child 5215 439d5ca71311
--- a/roadveh_cmd.c	Sat Dec 02 09:54:49 2006 +0000
+++ b/roadveh_cmd.c	Sat Dec 02 16:56:32 2006 +0000
@@ -736,9 +736,10 @@
 
 			if (--v->load_unload_time_rem != 0) return;
 
-			if (v->current_order.flags & OF_FULL_LOAD && CanFillVehicle(v)) {
+			if (CanFillVehicle(v) && (v->current_order.flags & OF_FULL_LOAD ||
+					(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED)))) {
 				SET_EXPENSES_TYPE(EXPENSES_ROADVEH_INC);
-				if (LoadUnloadVehicle(v)) {
+				if (LoadUnloadVehicle(v, false)) {
 					InvalidateWindow(WC_ROADVEH_LIST, v->owner);
 					MarkRoadVehDirty(v);
 				}
@@ -1513,7 +1514,7 @@
 			}
 
 			SET_EXPENSES_TYPE(EXPENSES_ROADVEH_INC);
-			if (LoadUnloadVehicle(v)) {
+			if (LoadUnloadVehicle(v, true)) {
 				InvalidateWindow(WC_ROADVEH_LIST, v->owner);
 				MarkRoadVehDirty(v);
 			}