diff options
| author | rubidium <rubidium@openttd.org> | 2007-04-29 18:21:24 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-04-29 18:21:24 +0000 |
| commit | 6440440f129041fbb60d25fbfb182a68c82f17a2 (patch) | |
| tree | 87b202dc9547deba8ff9f14dc895001e6404777e /src/ship_cmd.cpp | |
| parent | bf04c88ecad4d4a183ebf8461f1d58fa57d658ae (diff) | |
| download | openttd-6440440f129041fbb60d25fbfb182a68c82f17a2.tar.xz | |
(svn r9752) -Codechange: remove some duplication related to BeginLoading.
Diffstat (limited to 'src/ship_cmd.cpp')
| -rw-r--r-- | src/ship_cmd.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 58864273b..6e4d44d94 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -304,7 +304,7 @@ static void HandleShipLoading(Vehicle *v) { switch (v->current_order.type) { case OT_LOADING: { - if (--v->load_unload_time_rem) return; + if (--v->load_unload_time_rem != 0) return; if (CanFillVehicle(v) && ( v->current_order.flags & OF_FULL_LOAD || @@ -736,8 +736,6 @@ static void ShipController(Vehicle *v) st = GetStation(v->current_order.dest); if (st->facilities & FACIL_DOCK) { // ugly, ugly workaround for problem with ships able to drop off cargo at wrong stations v->BeginLoading(); - v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER; - v->current_order.flags |= OF_NON_STOP; ShipArrivesAt(v, st); SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); |