File diff r22388:83832fb3597c → r22389:1757ebccc162
src/economy.cpp
Show inline comments
 
@@ -1648,12 +1648,13 @@ static void LoadUnloadVehicle(Vehicle *f
 

	
 
		if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && (front->current_order.GetUnloadType() & OUFB_NO_UNLOAD) == 0) {
 
			uint cargo_count = v->cargo.UnloadCount();
 
			uint amount_unloaded = _settings_game.order.gradual_loading ? min(cargo_count, load_amount) : cargo_count;
 
			bool remaining = false; // Are there cargo entities in this vehicle that can still be unloaded here?
 

	
 
			assert(payment != NULL);
 
			payment->SetCargo(v->cargo_type);
 

	
 
			if (!HasBit(ge->status, GoodsEntry::GES_ACCEPTANCE) && v->cargo.ActionCount(VehicleCargoList::MTA_DELIVER) > 0) {
 
				/* The station does not accept our goods anymore. */
 
				if (front->current_order.GetUnloadType() & (OUFB_TRANSFER | OUFB_UNLOAD)) {
 
					/* Transfer instead of delivering. */