mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: Avoid using override keyword as variable names. 

Rename variables named `override`.
pull/13985/head
Peter Nelson 2025-04-09 08:50:15 +01:00 committed by Peter Nelson
parent 91ab7f10cd
commit f57065dd41
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf.cpp
View File

@ -1450,9 +1450,9 @@ static void FinalisePriceBaseMultipliers()
GRFFile &source = _grf_files[i]; GRFFile &source = _grf_files[i];
auto it = _grf_id_overrides.find(source.grfid); auto it = _grf_id_overrides.find(source.grfid);
if (it == std::end(_grf_id_overrides)) continue; 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; if (dest == std::end(_grf_files)) continue;
grf_overrides[i] = static_cast<int>(std::ranges::distance(std::begin(_grf_files), dest)); grf_overrides[i] = static_cast<int>(std::ranges::distance(std::begin(_grf_files), dest));

8
src/newgrf/newgrf_act0_airports.cpp
View File

@ -221,15 +221,15 @@ static ChangeInfoResult AirportTilesChangeInfo(uint first, uint last, int prop,
} }
case 0x09: { // Airport tile override 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. */ /* The airport tile being overridden must be an original airport tile. */
if (override >= NEW_AIRPORTTILE_OFFSET) { if (override_id >= NEW_AIRPORTTILE_OFFSET) {
GrfMsg(2, "AirportTileChangeInfo: Attempt to override new airport tile {} with airport tile id {}. Ignoring.", override, id); GrfMsg(2, "AirportTileChangeInfo: Attempt to override new airport tile {} with airport tile id {}. Ignoring.", override_id, id);
continue; continue;
} }
_airporttile_mngr.Add(id, _cur.grffile->grfid, override); _airporttile_mngr.Add(id, _cur.grffile->grfid, override_id);
break; break;
} }

8
src/newgrf/newgrf_act0_houses.cpp
View File

@ -225,15 +225,15 @@ static ChangeInfoResult TownHouseChangeInfo(uint first, uint last, int prop, Byt
} }
case 0x15: { // House override byte 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. */ /* The house being overridden must be an original house. */
if (override >= NEW_HOUSE_OFFSET) { if (override_id >= NEW_HOUSE_OFFSET) {
GrfMsg(2, "TownHouseChangeInfo: Attempt to override new house {} with house id {}. Ignoring.", override, id); GrfMsg(2, "TownHouseChangeInfo: Attempt to override new house {} with house id {}. Ignoring.", override_id, id);
continue; continue;
} }
_house_mngr.Add(id, _cur.grffile->grfid, override); _house_mngr.Add(id, _cur.grffile->grfid, override_id);
break; break;
} }