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

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);