diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2021-01-08 10:16:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 11:16:18 +0100 |
| commit | 9b800a96ed32720ff60b74e498a0e0a6351004f9 (patch) | |
| tree | 3f287d339e15c4902ee415556475fd9b2918d33c /src/tunnelbridge_cmd.cpp | |
| parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
| download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz | |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/tunnelbridge_cmd.cpp')
| -rw-r--r-- | src/tunnelbridge_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 0423cde1f..e19b64c50 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -206,7 +206,7 @@ CommandCost CheckBridgeAvailability(BridgeType bridge_type, uint bridge_len, DoC const BridgeSpec *b = GetBridgeSpec(bridge_type); if (b->avail_year > _cur_year) return CMD_ERROR; - uint max = min(b->max_length, _settings_game.construction.max_bridge_length); + uint max = std::min(b->max_length, _settings_game.construction.max_bridge_length); if (b->min_length > bridge_len) return CMD_ERROR; if (bridge_len <= max) return CommandCost(); @@ -1079,8 +1079,8 @@ static void DrawBridgePillars(const PalSpriteID *psid, const TileInfo *ti, Axis GetSlopePixelZOnEdge(ti->tileh, ReverseDiagDir(south_dir), &z_front_north, &z_back_north); /* Shared height of pillars */ - int z_front = max(z_front_north, z_front_south); - int z_back = max(z_back_north, z_back_south); + int z_front = std::max(z_front_north, z_front_south); + int z_back = std::max(z_back_north, z_back_south); /* x and y size of bounding-box of pillars */ int w = bounding_box_size[axis]; @@ -1912,7 +1912,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti if (v->type == VEH_ROAD) spd *= 2; Vehicle *first = v->First(); - first->cur_speed = min(first->cur_speed, spd); + first->cur_speed = std::min(first->cur_speed, spd); } if (vdir == dir) { |