From 8f42c380398a75d2dda49902e83fe08957818127 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 12 Sep 2008 17:11:28 +0000 Subject: (svn r14296) -Codechange: there is no case where an invalid waypoint index should be passed to be drawn as a string. --- src/strings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/strings.cpp') diff --git a/src/strings.cpp b/src/strings.cpp index f644eb795..065b617fb 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -822,9 +822,9 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c case SCC_WAYPOINT_NAME: { // {WAYPOINT} Waypoint *wp = GetWaypoint(GetInt32(&argv)); - if (!wp->IsValid()) { // waypoint doesn't exist anymore - buff = GetStringWithArgs(buff, STR_UNKNOWN_DESTINATION, NULL, last); - } else if (wp->name != NULL) { + assert(wp->IsValid()); + + if (wp->name != NULL) { buff = strecpy(buff, wp->name, last); } else { int64 temp[2]; -- cgit v1.2.3-54-g00ecf