cpp/openttd-patchpack/source Changeset - r28704:bc0271247027

Changeset - r28704:bc0271247027

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Peter Nelson - 10 months ago 2024-02-07 08:51:03
peter1138@openttd.org

Fix #12024: Autoreplace failed news message for trains must go to lead engine. (#12025)

1 file changed with 3 insertions and 2 deletions:

src/autoreplace_cmd.cpp

0 comments (0 inline, 0 general)

src/autoreplace_cmd.cpp

➞

Show inline comments

@@ @@ -330,26 +330,27 @@ static CommandCost BuildReplacementVehic @@
 	/* Does it need to be refitted */
 	CargoID refit_cargo = GetNewCargoTypeForReplace(old_veh, e, part_of_chain);
 	if (!IsValidCargoID(refit_cargo)) {
 		if (!IsLocalCompany()) return CommandCost();
 		SetDParam(0, old_veh->index);
 		VehicleID old_veh_id = (old_veh->type == VEH_TRAIN) ? Train::From(old_veh)->First()->index : old_veh->index;
 		SetDParam(0, old_veh_id);
 		int order_id = GetIncompatibleRefitOrderIdForAutoreplace(old_veh, e);
 		if (order_id != -1) {
 			/* Orders contained a refit order that is incompatible with the new vehicle. */
 			SetDParam(1, STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT);
 			SetDParam(2, order_id + 1); // 1-based indexing for display
 		} else {
 			/* Current cargo is incompatible with the new vehicle. */
 			SetDParam(1, STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO);
 			SetDParam(2, CargoSpec::Get(old_veh->cargo_type)->name);
+		}
-		AddVehicleAdviceNewsItem(STR_NEWS_VEHICLE_AUTORENEW_FAILED, old_veh->index);
+		AddVehicleAdviceNewsItem(STR_NEWS_VEHICLE_AUTORENEW_FAILED, old_veh_id);
 		return CommandCost();
+	}
 	/* Build the new vehicle */
 	VehicleID new_veh_id;
 	std::tie(cost, new_veh_id, std::ignore, std::ignore, std::ignore) = Command<CMD_BUILD_VEHICLE>::Do(DC_EXEC | DC_AUTOREPLACE, old_veh->tile, e, true, INVALID_CARGO, INVALID_CLIENT_ID);

0 comments (0 inline, 0 general)