From 039794e83ca40717e0a5aff927f20e7a560ac7c5 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sat, 2 Dec 2006 16:56:32 +0000 Subject: (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros) --- aircraft_cmd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'aircraft_cmd.c') diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 1ed9962f1..46e06f417 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -1258,9 +1258,10 @@ static void HandleAircraftLoading(Vehicle *v, int mode) if (mode != 0) return; 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_AIRCRAFT_INC); - if (LoadUnloadVehicle(v)) { + if (LoadUnloadVehicle(v, false)) { InvalidateWindow(WC_AIRCRAFT_LIST, v->owner); MarkAircraftDirty(v); } @@ -1377,7 +1378,7 @@ static void AircraftEntersTerminal(Vehicle *v) } SET_EXPENSES_TYPE(EXPENSES_AIRCRAFT_INC); - LoadUnloadVehicle(v); + LoadUnloadVehicle(v, true); MarkAircraftDirty(v); InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); InvalidateWindowClasses(WC_AIRCRAFT_LIST); -- cgit v1.2.3-70-g09d2