diff options
author | rubidium <rubidium@openttd.org> | 2008-09-12 17:11:28 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-09-12 17:11:28 +0000 |
commit | 8f42c380398a75d2dda49902e83fe08957818127 (patch) | |
tree | 6bf1c841bd750a770ab0fdfeb4884b0cc54c13ba | |
parent | a2b00e24b6413ca14a58c430feeed9acd7ef2764 (diff) | |
download | openttd-8f42c380398a75d2dda49902e83fe08957818127.tar.xz |
(svn r14296) -Codechange: there is no case where an invalid waypoint index should be passed to be drawn as a string.
-rw-r--r-- | src/strings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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]; |