diff options
author | rubidium <rubidium@openttd.org> | 2007-05-02 18:29:11 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-05-02 18:29:11 +0000 |
commit | 981bf52bdd1a2f5fbf447f211a4dbbb43547aee3 (patch) | |
tree | 34ee55f1443a9aa3ff65e7d58e973121dd9ce61f /src/ship_cmd.cpp | |
parent | e4dc1f460b4e431bf3336a5fde25ab0dbe580e5e (diff) | |
download | openttd-981bf52bdd1a2f5fbf447f211a4dbbb43547aee3.tar.xz |
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
Diffstat (limited to 'src/ship_cmd.cpp')
-rw-r--r-- | src/ship_cmd.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 9878e7cd9..0e75f6718 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -306,15 +306,8 @@ static void HandleShipLoading(Vehicle *v) case OT_LOADING: { if (--v->load_unload_time_rem != 0) return; - if (CanFillVehicle(v) && ( - v->current_order.flags & OF_FULL_LOAD || - (_patches.gradual_loading && !HASBIT(v->vehicle_flags, VF_LOADING_FINISHED)) - )) { - SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); - if (LoadUnloadVehicle(v, false)) { - InvalidateWindow(WC_SHIPS_LIST, v->owner); - v->MarkDirty(); - } + if (CanFillVehicle(v)) { + LoadUnloadVehicle(v); return; } PlayShipSound(v); |