From 2f6ee3a4a119fbddb7dcde34c8ceaf5ac63efb14 Mon Sep 17 00:00:00 2001 From: bjarni Date: Sat, 19 Jan 2008 22:47:07 +0000 Subject: (svn r11928) -Fix (r6393): [autoreplace] autoreplace could refit train engines to the wrong cargo type if the old engine had no cargo capacity and the new one had Now autoreplace will always look at the wagons to figure out what to replace to (as originally intended) --- src/autoreplace_cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp index f0a8f171a..ef5e0d70f 100644 --- a/src/autoreplace_cmd.cpp +++ b/src/autoreplace_cmd.cpp @@ -93,7 +93,7 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type) if (new_cargo_type == CT_INVALID) return CT_NO_REFIT; // Don't try to refit an engine with no cargo capacity - if (v->cargo_type == new_cargo_type || CanRefitTo(engine_type, v->cargo_type)) { + if (v->cargo_cap != 0 && (v->cargo_type == new_cargo_type || CanRefitTo(engine_type, v->cargo_type))) { if (VerifyAutoreplaceRefitForOrders(v, engine_type)) { return v->cargo_type == new_cargo_type ? (CargoID)CT_NO_REFIT : v->cargo_type; } else { -- cgit v1.2.3-70-g09d2