From caebb5ac63d055c9cd1e99be49c78862e5459988 Mon Sep 17 00:00:00 2001 From: michi_cc Date: Wed, 14 Dec 2011 22:38:15 +0000 Subject: (svn r23518) -Fix (r23124): [NewGRF] The refit cost callback wasn't called if only the subtype differed. --- src/vehicle_cmd.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/vehicle_cmd.cpp') diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index 4914bcfb3..b101a16bc 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -228,7 +228,7 @@ static int GetRefitCostFactor(const Vehicle *v, EngineID engine_type, CargoID ne } *auto_refit_allowed = e->info.refit_cost == 0; - return e->info.refit_cost; + return (v->cargo_type != new_cid) ? e->info.refit_cost : 0; } /** @@ -335,17 +335,15 @@ static CommandCost RefitVehicle(Vehicle *v, bool only_this, uint8 num_vehicles, v->cargo_type = temp_cid; v->cargo_subtype = temp_subtype; - if (new_cid != v->cargo_type) { - bool auto_refit_allowed; - CommandCost refit_cost = GetRefitCost(v, v->engine_type, new_cid, new_subtype, &auto_refit_allowed); - if (auto_refit && !auto_refit_allowed) { - /* Sorry, auto-refitting not allowed, subtract the cargo amount again from the total. */ - total_capacity -= amount; - total_mail_capacity -= mail_capacity; - continue; - } - cost.AddCost(refit_cost); + bool auto_refit_allowed; + CommandCost refit_cost = GetRefitCost(v, v->engine_type, new_cid, new_subtype, &auto_refit_allowed); + if (auto_refit && !auto_refit_allowed) { + /* Sorry, auto-refitting not allowed, subtract the cargo amount again from the total. */ + total_capacity -= amount; + total_mail_capacity -= mail_capacity; + continue; } + cost.AddCost(refit_cost); if (flags & DC_EXEC) { v->cargo.Truncate((v->cargo_type == new_cid) ? amount : 0); -- cgit v1.2.3-54-g00ecf