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

Codechange: use std::move over copying where applicable

pull/13840/head
Rubidium 2025-03-16 16:32:05 +01:00 committed by rubidium42
parent f214c81e97
commit 5ea5855677
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/landscape.cpp
View File

@ -717,7 +717,7 @@ std::tuple<CommandCost, Money> CmdClearArea(DoCommandFlags flags, TileIndex tile
TileIndex t = *iter; TileIndex t = *iter;
CommandCost ret = Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlags{flags}.Reset(DoCommandFlag::Execute), t); CommandCost ret = Command<CMD_LANDSCAPE_CLEAR>::Do(DoCommandFlags{flags}.Reset(DoCommandFlag::Execute), t);
if (ret.Failed()) { if (ret.Failed()) {
last_error = ret; last_error = std::move(ret);
/* We may not clear more tiles. */ /* We may not clear more tiles. */
if (c != nullptr && GB(c->clear_limit, 16, 16) < 1) break; if (c != nullptr && GB(c->clear_limit, 16, 16) < 1) break;

2
src/object_cmd.cpp
View File

@ -410,7 +410,7 @@ CommandCost CmdBuildObjectArea(DoCommandFlags flags, TileIndex tile, TileIndex s
if (c != nullptr && limit-- <= 0) break; if (c != nullptr && limit-- <= 0) break;
if (ret.Failed()) { if (ret.Failed()) {
last_error = ret; last_error = std::move(ret);
continue; continue;
} }

8
src/rail_cmd.cpp
View File

@ -891,7 +891,7 @@ static CommandCost CmdRailTrackHelper(DoCommandFlags flags, TileIndex tile, Tile
ret = remove ? Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir)) : Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals); ret = remove ? Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir)) : Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals);
if (ret.Failed()) { if (ret.Failed()) {
last_error = ret; last_error = std::move(ret);
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) { if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
if (fail_on_obstacle) return last_error; 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 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 */ /* Trying to convert other's rail */
CommandCost ret = CheckTileOwnership(tile); CommandCost ret = CheckTileOwnership(tile);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = std::move(ret);
continue; continue;
} }
@ -1607,7 +1607,7 @@ CommandCost CmdConvertRail(DoCommandFlags flags, TileIndex tile, TileIndex area_
if (!IsCompatibleRail(type, totype)) { if (!IsCompatibleRail(type, totype)) {
ret = IsPlainRailTile(tile) ? EnsureNoTrainOnTrackBits(tile, GetTrackBits(tile)) : EnsureNoVehicleOnGround(tile); ret = IsPlainRailTile(tile) ? EnsureNoTrainOnTrackBits(tile, GetTrackBits(tile)) : EnsureNoVehicleOnGround(tile);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = std::move(ret);
continue; continue;
} }
} }
@ -1691,7 +1691,7 @@ CommandCost CmdConvertRail(DoCommandFlags flags, TileIndex tile, TileIndex area_
if (!IsCompatibleRail(GetRailType(tile), totype)) { if (!IsCompatibleRail(GetRailType(tile), totype)) {
ret = TunnelBridgeIsFree(tile, endtile); ret = TunnelBridgeIsFree(tile, endtile);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = std::move(ret);
continue; continue;
} }
} }

12
src/road_cmd.cpp
View File

@ -1025,7 +1025,7 @@ CommandCost CmdBuildLongRoad(DoCommandFlags flags, TileIndex end_tile, TileIndex
CommandCost ret = Command<CMD_BUILD_ROAD>::Do(flags, tile, bits, rt, drd, TownID::Invalid()); CommandCost ret = Command<CMD_BUILD_ROAD>::Do(flags, tile, bits, rt, drd, TownID::Invalid());
if (ret.Failed()) { if (ret.Failed()) {
last_error = ret; last_error = std::move(ret);
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT) { if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT) {
if (is_ai) return last_error; 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 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<CommandCost, Money> CmdRemoveLongRoad(DoCommandFlags flags, TileIndex
case STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS: case STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS:
break; break;
default: 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)) { if (!CanConvertUnownedRoadType(owner, rtt)) {
CommandCost ret = CheckOwnership(owner, tile); CommandCost ret = CheckOwnership(owner, tile);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = std::move(ret);
continue; continue;
} }
} }
@ -2495,7 +2495,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_
Town *t = ClosestTownFromTile(tile, _settings_game.economy.dist_local_authority); Town *t = ClosestTownFromTile(tile, _settings_game.economy.dist_local_authority);
CommandCost ret = CheckforTownRating({}, t, tt == MP_TUNNELBRIDGE ? TUNNELBRIDGE_REMOVE : ROAD_REMOVE); CommandCost ret = CheckforTownRating({}, t, tt == MP_TUNNELBRIDGE ? TUNNELBRIDGE_REMOVE : ROAD_REMOVE);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = std::move(ret);
continue; continue;
} }
} }
@ -2506,7 +2506,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_
if (!HasPowerOnRoad(from_type, to_type)) { if (!HasPowerOnRoad(from_type, to_type)) {
CommandCost ret = EnsureNoVehicleOnGround(tile); CommandCost ret = EnsureNoVehicleOnGround(tile);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = std::move(ret);
continue; continue;
} }
@ -2562,7 +2562,7 @@ CommandCost CmdConvertRoad(DoCommandFlags flags, TileIndex tile, TileIndex area_
if (!HasPowerOnRoad(from_type, to_type)) { if (!HasPowerOnRoad(from_type, to_type)) {
CommandCost ret = TunnelBridgeIsFree(tile, endtile); CommandCost ret = TunnelBridgeIsFree(tile, endtile);
if (ret.Failed()) { if (ret.Failed()) {
error = ret; error = std::move(ret);
continue; continue;
} }

2
src/station_cmd.cpp
View File

@ -2343,7 +2343,7 @@ static CommandCost RemoveGenericRoadStop(DoCommandFlags flags, const TileArea &r
ret = RemoveRoadStop(cur_tile, flags); ret = RemoveRoadStop(cur_tile, flags);
} }
if (ret.Failed()) { if (ret.Failed()) {
last_error = ret; last_error = std::move(ret);
continue; continue;
} }
cost.AddCost(ret); cost.AddCost(ret);

4
src/terraform_cmd.cpp
View File

@ -349,10 +349,10 @@ std::tuple<CommandCost, Money, TileIndex> CmdLevelLand(DoCommandFlags flags, Til
CommandCost ret; CommandCost ret;
std::tie(ret, std::ignore, error_tile) = Command<CMD_TERRAFORM_LAND>::Do(DoCommandFlags{flags}.Reset(DoCommandFlag::Execute), t, SLOPE_N, curh <= h); std::tie(ret, std::ignore, error_tile) = Command<CMD_TERRAFORM_LAND>::Do(DoCommandFlags{flags}.Reset(DoCommandFlag::Execute), t, SLOPE_N, curh <= h);
if (ret.Failed()) { if (ret.Failed()) {
last_error = ret; last_error = std::move(ret);
/* Did we reach the limit? */ /* 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; break;
} }

2
src/vehicle_cmd.cpp
View File

@ -723,7 +723,7 @@ CommandCost CmdDepotSellAllVehicles(DoCommandFlags flags, TileIndex tile, Vehicl
cost.AddCost(ret); cost.AddCost(ret);
had_success = true; had_success = true;
} else { } else {
last_error = ret; last_error = std::move(ret);
} }
} }