From 62e568ce657c27c443e404aeeb71b0608f903ef4 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Tue, 30 Sep 2025 16:34:02 +0200 Subject: [PATCH] Codefix: shadowing variable, grouping loop increments --- src/waypoint_cmd.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp index 4d514c0567..f76d9bd1f7 100644 --- a/src/waypoint_cmd.cpp +++ b/src/waypoint_cmd.cpp @@ -233,16 +233,14 @@ CommandCost CmdBuildRailWaypoint(DoCommandFlags flags, TileIndex start_tile, Axi const StationSpec *spec = StationClass::Get(spec_class)->GetSpec(spec_index); RailStationTileLayout stl{spec, count, 1}; - auto it = stl.begin(); /* Check whether the tiles we're building on are valid rail or not. */ TileIndexDiff offset = TileOffsByAxis(OtherAxis(axis)); - for (int i = 0; i < count; i++) { - TileIndex tile = start_tile + i * offset; + for (auto [i, it, tile] = std::make_tuple(0, stl.begin(), start_tile); i < count; ++i, ++it, tile += offset) { CommandCost ret = IsValidTileForWaypoint(tile, axis, &est); 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; } @@ -297,17 +295,14 @@ CommandCost CmdBuildRailWaypoint(DoCommandFlags flags, TileIndex start_tile, Axi wp->UpdateVirtCoord(); - auto it = stl.begin(); - Company *c = Company::Get(wp->owner); - for (int i = 0; i < count; i++) { - TileIndex tile = start_tile + i * offset; + for (auto [i, it, tile] = std::make_tuple(0, stl.begin(), start_tile); i < count; ++i, ++it, tile += offset) { uint8_t old_specindex = HasStationTileRail(tile) ? GetCustomStationSpecIndex(tile) : 0; if (!HasStationTileRail(tile)) c->infrastructure.station++; bool reserved = IsTileType(tile, MP_RAILWAY) ? HasBit(GetRailReservationTrackBits(tile), AxisToTrack(axis)) : 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); SetRailStationTileFlags(tile, spec);