mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2025-12-10 06:52:05 +01:00
Code Issues Releases Wiki Activity

Codefix: shadowing variable, grouping loop increments

Browse Source
This commit is contained in:
Rubidium
2025-09-30 16:34:02 +02:00
committed by rubidium42
parent f0f964577d
commit 62e568ce65
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/waypoint_cmd.cpp
View File

@@ -233,16 +233,14 @@ CommandCost CmdBuildRailWaypoint(DoCommandFlags flags, TileIndex start_tile, Axi
const StationSpec *spec = StationClass::Get(spec_class)->GetSpec(spec_index); const StationSpec *spec = StationClass::Get(spec_class)->GetSpec(spec_index);
RailStationTileLayout stl{spec, count, 1}; RailStationTileLayout stl{spec, count, 1};
auto it = stl.begin();
/* Check whether the tiles we're building on are valid rail or not. */ /* Check whether the tiles we're building on are valid rail or not. */
TileIndexDiff offset = TileOffsByAxis(OtherAxis(axis)); TileIndexDiff offset = TileOffsByAxis(OtherAxis(axis));
for (int i = 0; i < count; i++) { for (auto [i, it, tile] = std::make_tuple(0, stl.begin(), start_tile); i < count; ++i, ++it, tile += offset) {
TileIndex tile = start_tile + i * offset;
CommandCost ret = IsValidTileForWaypoint(tile, axis, &est); CommandCost ret = IsValidTileForWaypoint(tile, axis, &est);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
ret = IsRailStationBridgeAboveOk(tile, spec, StationType::RailWaypoint, *it++ + axis); ret = IsRailStationBridgeAboveOk(tile, spec, StationType::RailWaypoint, *it + axis);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
} }
@@ -297,17 +295,14 @@ CommandCost CmdBuildRailWaypoint(DoCommandFlags flags, TileIndex start_tile, Axi
wp->UpdateVirtCoord(); wp->UpdateVirtCoord();
auto it = stl.begin();
Company *c = Company::Get(wp->owner); Company *c = Company::Get(wp->owner);
for (int i = 0; i < count; i++) { for (auto [i, it, tile] = std::make_tuple(0, stl.begin(), start_tile); i < count; ++i, ++it, tile += offset) {
TileIndex tile = start_tile + i * offset;
uint8_t old_specindex = HasStationTileRail(tile) ? GetCustomStationSpecIndex(tile) : 0; uint8_t old_specindex = HasStationTileRail(tile) ? GetCustomStationSpecIndex(tile) : 0;
if (!HasStationTileRail(tile)) c->infrastructure.station++; if (!HasStationTileRail(tile)) c->infrastructure.station++;
bool reserved = IsTileType(tile, MP_RAILWAY) ? bool reserved = IsTileType(tile, MP_RAILWAY) ?
HasBit(GetRailReservationTrackBits(tile), AxisToTrack(axis)) : HasBit(GetRailReservationTrackBits(tile), AxisToTrack(axis)) :
HasStationReservation(tile); HasStationReservation(tile);
MakeRailWaypoint(tile, wp->owner, wp->index, axis, *it++, GetRailType(tile)); MakeRailWaypoint(tile, wp->owner, wp->index, axis, *it, GetRailType(tile));
SetCustomStationSpecIndex(tile, *specindex); SetCustomStationSpecIndex(tile, *specindex);
SetRailStationTileFlags(tile, spec); SetRailStationTileFlags(tile, spec);