(svn r14162) -Fix: Allow rail type conversion if the rail type cost multipliers are the same.

This commit is contained in:
peter1138 2008-08-24 23:29:58 +00:00
parent b2d6254b44
commit 6e4d8a273e
1 changed files with 4 additions and 2 deletions

View File

@ -183,7 +183,8 @@ static inline Money RailConvertCost(RailType from, RailType to)
* (the price of workers to get to place is that 1/4)
*/
if (HasPowerOnRail(from, to)) {
return ((RailBuildCost(to) - RailBuildCost(from)) * 5) >> 2;
Money cost = ((RailBuildCost(to) - RailBuildCost(from)) * 5) >> 2;
if (cost != 0) return cost;
}
/* el. rail -> rail
@ -191,7 +192,8 @@ static inline Money RailConvertCost(RailType from, RailType to)
* (the price of workers is 1 / 4 + price of copper sold to a recycle center)
*/
if (HasPowerOnRail(to, from)) {
return (RailBuildCost(from) - RailBuildCost(to)) >> 2;
Money cost = (RailBuildCost(from) - RailBuildCost(to)) >> 2;
if (cost != 0) return cost;
}
/* make the price the same as remove + build new type */