From c5960b4be1608be0e502dfeb35ef9cee3a08253a Mon Sep 17 00:00:00 2001 From: smatz Date: Sun, 14 Sep 2008 15:48:49 +0000 Subject: [PATCH] (svn r14322) -Fix (r10368): possible assert when renaming removed waypoint --- src/waypoint.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/waypoint.cpp b/src/waypoint.cpp index e36668db68..cc74153678 100644 --- a/src/waypoint.cpp +++ b/src/waypoint.cpp @@ -381,12 +381,10 @@ static bool IsUniqueWaypointName(const char *name) */ CommandCost CmdRenameWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { - Waypoint *wp; - if (!IsValidWaypointID(p1)) return CMD_ERROR; - wp = GetWaypoint(p1); - if (!CheckTileOwnership(wp->xy)) return CMD_ERROR; + Waypoint *wp = GetWaypoint(p1); + if (!CheckOwnership(wp->owner)) return CMD_ERROR; if (!StrEmpty(_cmd_text)) { if (strlen(_cmd_text) >= MAX_LENGTH_WAYPOINT_NAME_BYTES) return CMD_ERROR;