From f57065dd416009bff1b9a0d1daff825f25b4b4ba Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 9 Apr 2025 08:50:15 +0100 Subject: [PATCH] Codefix: Avoid using override keyword as variable names. Rename variables named `override`. --- src/newgrf.cpp | 4 ++-- src/newgrf/newgrf_act0_airports.cpp | 8 ++++---- src/newgrf/newgrf_act0_houses.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 2b08eae92d..46c95a643d 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -1450,9 +1450,9 @@ static void FinalisePriceBaseMultipliers() GRFFile &source = _grf_files[i]; auto it = _grf_id_overrides.find(source.grfid); if (it == std::end(_grf_id_overrides)) continue; - uint32_t override = it->second; + uint32_t override_grfid = it->second; - auto dest = std::ranges::find(_grf_files, override, &GRFFile::grfid); + auto dest = std::ranges::find(_grf_files, override_grfid, &GRFFile::grfid); if (dest == std::end(_grf_files)) continue; grf_overrides[i] = static_cast(std::ranges::distance(std::begin(_grf_files), dest)); diff --git a/src/newgrf/newgrf_act0_airports.cpp b/src/newgrf/newgrf_act0_airports.cpp index a509d62874..e70a165f15 100644 --- a/src/newgrf/newgrf_act0_airports.cpp +++ b/src/newgrf/newgrf_act0_airports.cpp @@ -221,15 +221,15 @@ static ChangeInfoResult AirportTilesChangeInfo(uint first, uint last, int prop, } case 0x09: { // Airport tile override - uint8_t override = buf.ReadByte(); + uint8_t override_id = buf.ReadByte(); /* The airport tile being overridden must be an original airport tile. */ - if (override >= NEW_AIRPORTTILE_OFFSET) { - GrfMsg(2, "AirportTileChangeInfo: Attempt to override new airport tile {} with airport tile id {}. Ignoring.", override, id); + if (override_id >= NEW_AIRPORTTILE_OFFSET) { + GrfMsg(2, "AirportTileChangeInfo: Attempt to override new airport tile {} with airport tile id {}. Ignoring.", override_id, id); continue; } - _airporttile_mngr.Add(id, _cur.grffile->grfid, override); + _airporttile_mngr.Add(id, _cur.grffile->grfid, override_id); break; } diff --git a/src/newgrf/newgrf_act0_houses.cpp b/src/newgrf/newgrf_act0_houses.cpp index 5aab2e67f0..51996ac3bc 100644 --- a/src/newgrf/newgrf_act0_houses.cpp +++ b/src/newgrf/newgrf_act0_houses.cpp @@ -225,15 +225,15 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt } case 0x15: { // House override byte - uint8_t override = buf.ReadByte(); + uint8_t override_id = buf.ReadByte(); /* The house being overridden must be an original house. */ - if (override >= NEW_HOUSE_OFFSET) { - GrfMsg(2, "TownHouseChangeInfo: Attempt to override new house {} with house id {}. Ignoring.", override, id); + if (override_id >= NEW_HOUSE_OFFSET) { + GrfMsg(2, "TownHouseChangeInfo: Attempt to override new house {} with house id {}. Ignoring.", override_id, id); continue; } - _house_mngr.Add(id, _cur.grffile->grfid, override); + _house_mngr.Add(id, _cur.grffile->grfid, override_id); break; }