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 /ship_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 'ship_cmd.c')
| -rw-r--r-- | ship_cmd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ship_cmd.c b/ship_cmd.c index c2ce21e99..e25ec5425 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -273,9 +273,10 @@ static void HandleShipLoading(Vehicle *v) if (v->current_order.type != OT_LOADING) return; if (--v->load_unload_time_rem) 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_SHIP_INC); - if (LoadUnloadVehicle(v)) { + if (LoadUnloadVehicle(v, false)) { InvalidateWindow(WC_SHIPS_LIST, v->owner); MarkShipDirty(v); } @@ -705,7 +706,7 @@ static void ShipController(Vehicle *v) ShipArrivesAt(v, st); SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); - if (LoadUnloadVehicle(v)) { + if (LoadUnloadVehicle(v, true)) { InvalidateWindow(WC_SHIPS_LIST, v->owner); MarkShipDirty(v); } |