diff options
| author | peter1138 <peter1138@openttd.org> | 2006-12-02 16:56:32 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-12-02 16:56:32 +0000 |
| commit | 039794e83ca40717e0a5aff927f20e7a560ac7c5 (patch) | |
| tree | 5e7abf3b12a62b206a4e2ea934e86e51e08cb91e /aircraft_cmd.c | |
| parent | 6a4d8fdd33de84ef691caa29ea77c21ff2b8d6c4 (diff) | |
| download | openttd-039794e83ca40717e0a5aff927f20e7a560ac7c5.tar.xz | |
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
Diffstat (limited to 'aircraft_cmd.c')
| -rw-r--r-- | aircraft_cmd.c | 7 |
1 files changed, 4 insertions, 3 deletions
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); |