Mercurial > hg > openttd

changeset 8362:8212ccaf2858 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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)
author bjarni <bjarni@openttd.org>
date Sat, 19 Jan 2008 22:47:07 +0000
parents e3b4302ca836
children e912fe1c1424
files src/autoreplace_cmd.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -93,7 +93,7 @@
 
 	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 {