Codechange: Use std::string for most of the user-settable custom names.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index 51d791fc2..01cdbc16e 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -398,7 +398,7 @@ CommandCost RemoveBuoy(TileIndex tile, DoCommandFlag flags)
 static bool IsUniqueWaypointName(const char *name)
 {
 	for (const Waypoint *wp : Waypoint::Iterate()) {
-		if (wp->name != nullptr && strcmp(wp->name, name) == 0) return false;
+		if (!wp->name.empty() && wp->name == name) return false;
 	}
 
 	return true;
@@ -431,8 +431,11 @@ CommandCost CmdRenameWaypoint(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
 	}
 
 	if (flags & DC_EXEC) {
-		free(wp->name);
-		wp->name = reset ? nullptr : stredup(text);
+		if (reset) {
+			wp->name.clear();
+		} else {
+			wp->name = text;
+		}
 
 		wp->UpdateVirtCoord();
 	}