From c73578aae6cd14c04a5bd19ab1b1016f3e6bcda9 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 8 Nov 2006 10:09:46 +0000 Subject: (svn r7112) -Codechange (r7106): Improve the test for determining if the rail type should be converted --- rail_cmd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'rail_cmd.c') diff --git a/rail_cmd.c b/rail_cmd.c index 395990a71..2877389d5 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -285,10 +285,9 @@ int32 CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (CmdFailed(ret)) return ret; cost += ret; - /* XXX Assume a 'higher' railtype has preference. This means we - * will convert from normal rail to electrified rail, but not - * the other way around. */ - if (GetRailType(tile) < railtype) { + /* If the rail types don't match, try to convert only if engines of + * the present rail type are powered on the new rail type. */ + if (GetRailType(tile) != railtype && HasPowerOnRail(GetRailType(tile), railtype)) { ret = DoCommand(tile, tile, railtype, flags, CMD_CONVERT_RAIL); if (CmdFailed(ret)) return ret; cost += ret; -- cgit v1.2.3-54-g00ecf