gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-22 13:09:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14165) -Codechange: When over-building rail with a different type, don't convert the rail if the engines of the new type are powered on the existing type.

Browse Source
This commit is contained in:
peter1138 2008-08-25 10:58:24 +00:00
parent 411c65e755
commit c76455be02
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rail_cmd.cpp
View File

@ -355,11 +355,16 @@ CommandCost CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p
cost.AddCost(ret); cost.AddCost(ret);
/* If the rail types don't match, try to convert only if engines of /* If the rail types don't match, try to convert only if engines of
* the new rail type are not powered on the present rail type and engines of
* the present rail type are powered on the new rail type. */ * the present rail type are powered on the new rail type. */
if (GetRailType(tile) != railtype && HasPowerOnRail(GetRailType(tile), railtype)) { if (GetRailType(tile) != railtype && !HasPowerOnRail(railtype, GetRailType(tile))) {
if (HasPowerOnRail(GetRailType(tile), railtype)) {
ret = DoCommand(tile, tile, railtype, flags, CMD_CONVERT_RAIL); ret = DoCommand(tile, tile, railtype, flags, CMD_CONVERT_RAIL);
if (CmdFailed(ret)) return ret; if (CmdFailed(ret)) return ret;
cost.AddCost(ret); cost.AddCost(ret);
} else {
return CMD_ERROR;
}
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {