Fix OpenTTD#7430: when train visits station, only reset time_since_pi…

…ckup if has room to load
MingweiSamuel · Oct 29, 2019 · 08ef982 · 08ef982
1 parent f3e4a7e
commit 08ef982
Showing 1 changed file with 45 additions and 42 deletions.
diff --git a/src/economy.cpp b/src/economy.cpp
@@ -1774,56 +1774,59 @@ static void LoadUnloadVehicle(Vehicle *front)
 		uint cap_left = v->cargo_cap - v->cargo.StoredCount();
 
 		if (cap_left > 0) {
-			/* If vehicle can load cargo, reset time_since_pickup. */
-			ge->time_since_pickup = 0;
-
-			/* If there's goods waiting at the station, and the vehicle
-			 * has capacity for it, load it on the vehicle. */
-			if ((v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0 || ge->cargo.AvailableCount() > 0) && MayLoadUnderExclusiveRights(st, v)) {
-				if (v->cargo.StoredCount() == 0) TriggerVehicle(v, VEHICLE_TRIGGER_NEW_CARGO);
-				if (_settings_game.order.gradual_loading) cap_left = min(cap_left, GetLoadAmount(v));
-
-				uint loaded = ge->cargo.Load(cap_left, &v->cargo, st->xy, next_station);
-				if (v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0) {
-					/* Remember if there are reservations left so that we don't stop
-					 * loading before they're loaded. */
-					SetBit(reservation_left, v->cargo_type);
-				}
 
-				/* Store whether the maximum possible load amount was loaded or not.*/
-				if (loaded == cap_left) {
-					SetBit(full_load_amount, v->cargo_type);
-				} else {
-					ClrBit(full_load_amount, v->cargo_type);
-				}
+		/* If vehicle can load cargo, reset time_since_pickup. */
+		ge->time_since_pickup = 0;
 
-				/* TODO: Regarding this, when we do gradual loading, we
-				 * should first unload all vehicles and then start
-				 * loading them. Since this will cause
-				 * VEHICLE_TRIGGER_EMPTY to be called at the time when
-				 * the whole vehicle chain is really totally empty, the
-				 * completely_emptied assignment can then be safely
-				 * removed; that's how TTDPatch behaves too. --pasky */
-				if (loaded > 0) {
-					completely_emptied = false;
-					anything_loaded = true;
-
-					st->time_since_load = 0;
-					st->last_vehicle_type = v->type;
-
-					if (ge->cargo.TotalCount() == 0) {
-						TriggerStationRandomisation(st, st->xy, SRT_CARGO_TAKEN, v->cargo_type);
-						TriggerStationAnimation(st, st->xy, SAT_CARGO_TAKEN, v->cargo_type);
-						AirportAnimationTrigger(st, AAT_STATION_CARGO_TAKEN, v->cargo_type);
-					}
+		/* If there's goods waiting at the station, and the vehicle
+			* has capacity for it, load it on the vehicle. */
+		if ((v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0 || ge->cargo.AvailableCount() > 0) && MayLoadUnderExclusiveRights(st, v)) {
+
+			if (v->cargo.StoredCount() == 0) TriggerVehicle(v, VEHICLE_TRIGGER_NEW_CARGO);
+			if (_settings_game.order.gradual_loading) cap_left = min(cap_left, GetLoadAmount(v));
+
+			uint loaded = ge->cargo.Load(cap_left, &v->cargo, st->xy, next_station);
+			if (v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0) {
+				/* Remember if there are reservations left so that we don't stop
+				 * loading before they're loaded. */
+				SetBit(reservation_left, v->cargo_type);
+			}
+
+			/* Store whether the maximum possible load amount was loaded or not.*/
+			if (loaded == cap_left) {
+				SetBit(full_load_amount, v->cargo_type);
+			} else {
+				ClrBit(full_load_amount, v->cargo_type);
+			}
+
+			/* TODO: Regarding this, when we do gradual loading, we
+			 * should first unload all vehicles and then start
+			 * loading them. Since this will cause
+			 * VEHICLE_TRIGGER_EMPTY to be called at the time when
+			 * the whole vehicle chain is really totally empty, the
+			 * completely_emptied assignment can then be safely
+			 * removed; that's how TTDPatch behaves too. --pasky */
+			if (loaded > 0) {
+				completely_emptied = false;
+				anything_loaded = true;
 
-					new_load_unload_ticks += loaded;
+				st->time_since_load = 0;
+				st->last_vehicle_type = v->type;
 
-					dirty_vehicle = dirty_station = true;
+				if (ge->cargo.TotalCount() == 0) {
+					TriggerStationRandomisation(st, st->xy, SRT_CARGO_TAKEN, v->cargo_type);
+					TriggerStationAnimation(st, st->xy, SAT_CARGO_TAKEN, v->cargo_type);
+					AirportAnimationTrigger(st, AAT_STATION_CARGO_TAKEN, v->cargo_type);
 				}
+
+				new_load_unload_ticks += loaded;
+
+				dirty_vehicle = dirty_station = true;
 			}
 		}
 
+		}
+
 		if (v->cargo.StoredCount() >= v->cargo_cap) {
 			SetBit(cargo_full, v->cargo_type);
 		} else {