From 74691a4218bf5d7305107cd308ed9cb0682f9233 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 30 Oct 2007 18:32:26 +0000 Subject: [PATCH] (svn r11360) -Fix [FS#1375]: do not crash when trying to "draw" an invalid string, just draw a message saying it is invalid. --- src/strings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strings.cpp b/src/strings.cpp index 393f45f114..8db7262153 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -116,12 +116,12 @@ static const char *GetStringPtr(StringID string) */ static char *GetStringWithArgs(char *buffr, uint string, const int64 *argv, const char* last) { + if (GB(string, 0, 16) == 0) return GetStringWithArgs(buffr, STR_UNDEFINED, argv, last); + uint index = GB(string, 0, 11); uint tab = GB(string, 11, 5); char buff[512]; - if (GB(string, 0, 16) == 0) error("!invalid string id 0 in GetString"); - switch (tab) { case 4: if (index >= 0xC0)