dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Remove min/max functions in favour of STL variants (#8502)

Browse Source
This commit is contained in:
Charles Pigott
2021-01-08 10:16:18 +00:00
committed by GitHub
parent c1fddb9a6a
commit 9b800a96ed
181 changed files with 900 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rail.h
View File

@@ -388,7 +388,7 @@ static inline Money RailClearCost(RailType railtype)
* cost.
*/
assert(railtype < RAILTYPE_END);
return max(_price[PR_CLEAR_RAIL], -RailBuildCost(railtype) * 3 / 4);
return std::max(_price[PR_CLEAR_RAIL], -RailBuildCost(railtype) * 3 / 4);
}
/**
@@ -408,8 +408,8 @@ static inline Money RailConvertCost(RailType from, RailType to)
* build costs, if the target type is more expensive (material upgrade costs).
* Upgrade can never be more expensive than re-building. */
if (HasPowerOnRail(from, to) || HasPowerOnRail(to, from)) {
Money upgradecost = RailBuildCost(to) / 8 + max((Money)0, RailBuildCost(to) - RailBuildCost(from));
return min(upgradecost, rebuildcost);
Money upgradecost = RailBuildCost(to) / 8 + std::max((Money)0, RailBuildCost(to) - RailBuildCost(from));
return std::min(upgradecost, rebuildcost);
}
/* make the price the same as remove + build new type for rail types