From 191f4be3e78c47339b89020a6bbc478c0f087f8f Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 27 Jun 2007 23:40:21 +0000 Subject: (svn r10368) -Fix: when renaming waypoints, ownership was only checked client-side, not in the command. --- src/waypoint.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/waypoint.cpp b/src/waypoint.cpp index 6b81cff41..d2980b3d9 100644 --- a/src/waypoint.cpp +++ b/src/waypoint.cpp @@ -371,6 +371,9 @@ CommandCost CmdRenameWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 if (!IsValidWaypointID(p1)) return CMD_ERROR; + wp = GetWaypoint(p1); + if (!CheckTileOwnership(wp->xy)) return CMD_ERROR; + if (!StrEmpty(_cmd_text)) { if (!IsUniqueWaypointName(_cmd_text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE); @@ -379,7 +382,6 @@ CommandCost CmdRenameWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 if (str == 0) return CMD_ERROR; if (flags & DC_EXEC) { - wp = GetWaypoint(p1); if (wp->string != STR_NULL) DeleteName(wp->string); wp->string = str; @@ -392,7 +394,6 @@ CommandCost CmdRenameWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 } } else { if (flags & DC_EXEC) { - wp = GetWaypoint(p1); if (wp->string != STR_NULL) DeleteName(wp->string); MakeDefaultWaypointName(wp); -- cgit v1.2.3-54-g00ecf