mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-22 05:59:10 +00:00
Code Issues Activity

Codefix: Don't unnecessarily extract string from bridge CommandCost result. (#14507)

Browse Source
This commit is contained in:
Peter Nelson
2025-08-10 22:01:03 +01:00
committed by GitHub
parent 78f7060994
commit cd61682ebf
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bridge_gui.cpp
View File

@@ -379,13 +379,10 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
/* only query bridge building possibility once, result is the same for all bridges! /* only query bridge building possibility once, result is the same for all bridges!
* returns CMD_ERROR on failure, and price on success */ * returns CMD_ERROR on failure, and price on success */
StringID errmsg = INVALID_STRING_ID;
CommandCost ret = Command<CMD_BUILD_BRIDGE>::Do(CommandFlagsToDCFlags(GetCommandFlags<CMD_BUILD_BRIDGE>()) | DoCommandFlag::QueryCost, end, start, transport_type, 0, road_rail_type); CommandCost ret = Command<CMD_BUILD_BRIDGE>::Do(CommandFlagsToDCFlags(GetCommandFlags<CMD_BUILD_BRIDGE>()) | DoCommandFlag::QueryCost, end, start, transport_type, 0, road_rail_type);
GUIBridgeList bl; GUIBridgeList bl;
if (ret.Failed()) { if (!ret.Failed()) {
errmsg = ret.GetErrorMessage();
} else {
/* check which bridges can be built */ /* check which bridges can be built */
const uint tot_bridgedata_len = CalcBridgeLenCostFactor(bridge_len + 2); const uint tot_bridgedata_len = CalcBridgeLenCostFactor(bridge_len + 2);
@@ -431,16 +428,12 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
} }
} }
/* give error cause if no bridges available here*/ /* give error cause if no bridges available here*/
if (!any_available) if (!any_available) ret = type_check;
{
errmsg = type_check.GetErrorMessage();
}
} }
if (!bl.empty()) { if (!bl.empty()) {
new BuildBridgeWindow(_build_bridge_desc, start, end, transport_type, road_rail_type, std::move(bl)); new BuildBridgeWindow(_build_bridge_desc, start, end, transport_type, road_rail_type, std::move(bl));
} else { } else {
ShowErrorMessage(GetEncodedString(STR_ERROR_CAN_T_BUILD_BRIDGE_HERE), GetEncodedString(errmsg), ShowErrorMessage(GetEncodedString(STR_ERROR_CAN_T_BUILD_BRIDGE_HERE), TileX(end) * TILE_SIZE, TileY(end) * TILE_SIZE, ret);
WL_INFO, TileX(end) * TILE_SIZE, TileY(end) * TILE_SIZE);
} }
} }