(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.

This commit is contained in:
rubidium
2007-05-02 18:29:11 +00:00
parent e4dc1f460b
commit 981bf52bdd
8 changed files with 44 additions and 54 deletions

View File

@@ -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;
}