From 981bf52bdd1a2f5fbf447f211a4dbbb43547aee3 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 2 May 2007 18:29:11 +0000 Subject: (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. --- src/train_cmd.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/train_cmd.cpp') diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 4e1d2064c..ef2f3178d 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2544,16 +2544,8 @@ static void HandleTrainLoading(Vehicle *v, bool mode) if (--v->load_unload_time_rem) return; - if (CanFillVehicle(v) && ( - v->current_order.flags & OF_FULL_LOAD || - (_patches.gradual_loading && !HASBIT(v->vehicle_flags, VF_LOADING_FINISHED)) - )) { - v->u.rail.days_since_order_progr = 0; // Prevent a train lost message for full loading trains - SET_EXPENSES_TYPE(EXPENSES_TRAIN_INC); - if (LoadUnloadVehicle(v, false)) { - InvalidateWindow(WC_TRAINS_LIST, v->owner); - v->MarkDirty(); - } + if (CanFillVehicle(v)) { + LoadUnloadVehicle(v); return; } -- cgit v1.2.3-54-g00ecf