From e91230415d37882176da2e9bf5f863779b3db745 Mon Sep 17 00:00:00 2001 From: bjarni Date: Sat, 19 Jan 2008 23:34:52 +0000 Subject: [PATCH] (svn r11929) -Fix (r9981)[FS#1624]: [autoreplace] fixed a case where a single headed locomotive caused an assert when being replaced to a dualheaded one This triggered if the player had enough money to replace and refit one of them but not enough to refit the last one as well --- src/autoreplace_cmd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp index ef5e0d70f4..b451be8de1 100644 --- a/src/autoreplace_cmd.cpp +++ b/src/autoreplace_cmd.cpp @@ -21,6 +21,7 @@ #include "functions.h" #include "variables.h" #include "autoreplace_func.h" +#include "articulated_vehicles.h" #include "table/strings.h" @@ -175,7 +176,10 @@ static CommandCost ReplaceVehicle(Vehicle **w, byte flags, Money total_cost) if (replacement_cargo_type != CT_NO_REFIT) { /* add refit cost */ CommandCost refit_cost = GetRefitCost(new_engine_type); - if (old_v->type == VEH_TRAIN && IsMultiheaded(old_v)) refit_cost.AddCost(refit_cost); // pay for both ends + if (old_v->type == VEH_TRAIN && RailVehInfo(new_engine_type)->railveh_type == RAILVEH_MULTIHEAD) { + /* Since it's a dualheaded engine we have to pay once more because the rear end is being refitted too. */ + refit_cost.AddCost(refit_cost); + } cost.AddCost(refit_cost); }