summaryrefslogtreecommitdiff
path: root/src/roadveh_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-05-02 18:29:11 +0000
committerrubidium <rubidium@openttd.org>2007-05-02 18:29:11 +0000
commit981bf52bdd1a2f5fbf447f211a4dbbb43547aee3 (patch)
tree34ee55f1443a9aa3ff65e7d58e973121dd9ce61f /src/roadveh_cmd.cpp
parente4dc1f460b4e431bf3336a5fde25ab0dbe580e5e (diff)
downloadopenttd-981bf52bdd1a2f5fbf447f211a4dbbb43547aee3.tar.xz
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
Diffstat (limited to 'src/roadveh_cmd.cpp')
-rw-r--r--src/roadveh_cmd.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index a4525d2d1..c11e9c530 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -761,13 +761,8 @@ static void HandleRoadVehLoading(Vehicle *v)
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_ROADVEH_INC);
- if (LoadUnloadVehicle(v, false)) {
- InvalidateWindow(WC_ROADVEH_LIST, v->owner);
- v->MarkDirty();
- }
+ if (CanFillVehicle(v)) {
+ LoadUnloadVehicle(v);
return;
}