|
@@ -174,7 +174,7 @@ extern CommandCost CanExpandRailStation(
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
CommandCost CmdBuildRailWaypoint(TileIndex start_tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdBuildRailWaypoint(TileIndex start_tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
/* Unpack parameters */
|
|
|
Axis axis = Extract<Axis, 6, 1>(p1);
|
|
@@ -302,7 +302,7 @@ CommandCost CmdBuildRailWaypoint(TileInd
|
|
|
* @param text unused
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
CommandCost CmdBuildBuoy(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdBuildBuoy(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
if (tile == 0 || !HasTileWaterGround(tile)) return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
|
|
|
if (IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
|
|
@@ -413,7 +413,7 @@ static bool IsUniqueWaypointName(const s
|
|
|
* @param text the new name or an empty string when resetting to the default
|
|
|
* @return the cost of this operation or an error
|
|
|
*/
|
|
|
CommandCost CmdRenameWaypoint(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
|
|
|
CommandCost CmdRenameWaypoint(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
|
|
|
{
|
|
|
Waypoint *wp = Waypoint::GetIfValid(p1);
|
|
|
if (wp == nullptr) return CMD_ERROR;
|
|
@@ -423,7 +423,7 @@ CommandCost CmdRenameWaypoint(TileIndex
|
|
|
if (ret.Failed()) return ret;
|
|
|
}
|
|
|
|
|
|
bool reset = StrEmpty(text);
|
|
|
bool reset = text.empty();
|
|
|
|
|
|
if (!reset) {
|
|
|
if (Utf8StringLength(text) >= MAX_LENGTH_STATION_NAME_CHARS) return CMD_ERROR;
|