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/newgrf_config.cpp | |
| parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
| download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz | |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/newgrf_config.cpp')
| -rw-r--r-- | src/newgrf_config.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index 5ba54f26c..cd95a4b8a 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -260,7 +260,7 @@ void GRFParameterInfo::SetValue(struct GRFConfig *config, uint32 value) } else { SB(config->param[this->param_nr], this->first_bit, this->num_bit, value); } - config->num_params = max<uint>(config->num_params, this->param_nr + 1); + config->num_params = std::max<uint>(config->num_params, this->param_nr + 1); SetWindowDirty(WC_GAME_OPTIONS, WN_GAME_OPTIONS_NEWGRF_STATE); } @@ -339,7 +339,7 @@ static bool CalcGRFMD5Sum(GRFConfig *config, Subdirectory subdir) if (f == nullptr) return false; long start = ftell(f); - size = min(size, GRFGetSizeOfDataSection(f)); + size = std::min(size, GRFGetSizeOfDataSection(f)); if (start < 0 || fseek(f, start, SEEK_SET) < 0) { FioFCloseFile(f); |