From 5ea585567753241316c703dfc736c17dd3cc1b55 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sun, 16 Mar 2025 16:32:05 +0100 Subject: [PATCH] Codechange: use std::move over copying where applicable --- src/landscape.cpp | 2 +- src/object_cmd.cpp | 2 +- src/rail_cmd.cpp | 8 ++++---- src/road_cmd.cpp | 12 ++++++------ src/station_cmd.cpp | 2 +- src/terraform_cmd.cpp | 4 ++-- src/vehicle_cmd.cpp | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/landscape.cpp b/src/landscape.cpp index fd499c97c6..653bb2d8be 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -717,7 +717,7 @@ std::tuple CmdClearArea(DoCommandFlags flags, TileIndex tile TileIndex t = *iter; CommandCost ret = Command::Do(DoCommandFlags{flags}.Reset(DoCommandFlag::Execute), t); if (ret.Failed()) { - last_error = ret; + last_error = std::move(ret); /* We may not clear more tiles. */ if (c != nullptr && GB(c->clear_limit, 16, 16) < 1) break; diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp index 3cdaa07b72..454992bd77 100644 --- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -410,7 +410,7 @@ CommandCost CmdBuildObjectArea(DoCommandFlags flags, TileIndex tile, TileIndex s if (c != nullptr && limit-- <= 0) break; if (ret.Failed()) { - last_error = ret; + last_error = std::move(ret); continue; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 621aa6bd1c..f8f91524fe 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -891,7 +891,7 @@ static CommandCost CmdRailTrackHelper(DoCommandFlags flags, TileIndex tile, Tile ret = remove ? Command::Do(flags, tile, TrackdirToTrack(trackdir)) : Command::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals); if (ret.Failed()) { - last_error = ret; + last_error = std::move(ret); if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) { if (fail_on_obstacle) return last_error; if (had_success) break; // Keep going if we haven't constructed any rail yet, skipping the start of the drag @@ -1595,7 +1595,7 @@ CommandCost CmdConvertRail(DoCommandFlags flags, TileIndex tile, TileIndex area_ /* Trying to convert other's rail */ CommandCost ret = CheckTileOwnership(tile); if (ret.Failed()) { - error = ret; + error = std::move(ret); continue; } @@ -1607,7 +1607,7 @@ CommandCost CmdConvertRail(DoCommandFlags flags, TileIndex tile, TileIndex area_ if (!IsCompatibleRail(type, totype)) { ret = IsPlainRailTile(tile) ? EnsureNoTrainOnTrackBits(tile, GetTrackBits(tile)) : EnsureNoVehicleOnGround(tile); if (ret.Failed()) { - error = ret; + error = std::move(ret); continue; } } @@ -1691,7 +1691,7 @@ CommandCost CmdConvertRail(DoCommandFlags flags, TileIndex tile, TileIndex area_ if (!IsCompatibleRail(GetRailType(tile), totype)) { ret = TunnelBridgeIsFree(tile, endtile); if (ret.Failed()) { - error = ret; + error = std::move(ret); continue; } } diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index a804e84570..231e653561 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -1025,7 +1025,7 @@ CommandCost CmdBuildLongRoad(DoCommandFlags flags, TileIndex end_tile, TileIndex CommandCost ret = Command::Do(flags, tile, bits, rt, drd, TownID::Invalid()); if (ret.Failed()) { - last_error = ret; + last_error = std::move(ret); if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT) { if (is_ai) return last_error; if (had_success) break; // Keep going if we haven't constructed any road yet, skipping the start of the drag @@ -1119,7 +1119,7 @@ std::tuple CmdRemoveLongRoad(DoCommandFlags flags, TileIndex case STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS: break; default: - last_error = ret; + last_error = std::move(ret); } } } @@ -2484,7 +2484,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_ if (!CanConvertUnownedRoadType(owner, rtt)) { CommandCost ret = CheckOwnership(owner, tile); if (ret.Failed()) { - error = ret; + error = std::move(ret); continue; } } @@ -2495,7 +2495,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_ Town *t = ClosestTownFromTile(tile, _settings_game.economy.dist_local_authority); CommandCost ret = CheckforTownRating({}, t, tt == MP_TUNNELBRIDGE ? TUNNELBRIDGE_REMOVE : ROAD_REMOVE); if (ret.Failed()) { - error = ret; + error = std::move(ret); continue; } } @@ -2506,7 +2506,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_ if (!HasPowerOnRoad(from_type, to_type)) { CommandCost ret = EnsureNoVehicleOnGround(tile); if (ret.Failed()) { - error = ret; + error = std::move(ret); continue; } @@ -2562,7 +2562,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_ if (!HasPowerOnRoad(from_type, to_type)) { CommandCost ret = TunnelBridgeIsFree(tile, endtile); if (ret.Failed()) { - error = ret; + error = std::move(ret); continue; } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index b9f908a934..1f5d81bb11 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2343,7 +2343,7 @@ static CommandCost RemoveGenericRoadStop(DoCommandFlags flags, const TileArea &r ret = RemoveRoadStop(cur_tile, flags); } if (ret.Failed()) { - last_error = ret; + last_error = std::move(ret); continue; } cost.AddCost(ret); diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp index 9d2e6ecc70..0a73bd2b04 100644 --- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -349,10 +349,10 @@ std::tuple CmdLevelLand(DoCommandFlags flags, Til CommandCost ret; std::tie(ret, std::ignore, error_tile) = Command::Do(DoCommandFlags{flags}.Reset(DoCommandFlag::Execute), t, SLOPE_N, curh <= h); if (ret.Failed()) { - last_error = ret; + last_error = std::move(ret); /* Did we reach the limit? */ - if (ret.GetErrorMessage() == STR_ERROR_TERRAFORM_LIMIT_REACHED) limit = 0; + if (last_error.GetErrorMessage() == STR_ERROR_TERRAFORM_LIMIT_REACHED) limit = 0; break; } diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index 8193c85927..02c0042c54 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -723,7 +723,7 @@ CommandCost CmdDepotSellAllVehicles(DoCommandFlags flags, TileIndex tile, Vehicl cost.AddCost(ret); had_success = true; } else { - last_error = ret; + last_error = std::move(ret); } }