From a25ecfd982f0a29a749f93ede2a2b5c9cc4408e9 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 16 Nov 2013 09:54:22 +0000 Subject: (svn r26007) -Change: make handling strings coming from game scripts slightly more lenient, i.e. less 'fatal error... must quit' --- src/strings.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/strings.cpp b/src/strings.cpp index 66919e38c..efc68ce41 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -233,7 +233,10 @@ char *GetStringWithArgs(char *buffr, StringID string, StringParameters *args, co case 15: /* Old table for custom names. This is no longer used */ - error("Incorrect conversion of custom name string."); + if (!game_script) { + error("Incorrect conversion of custom name string."); + } + break; case GAME_TEXT_TAB: return FormatString(buffr, GetGameStringPtr(index), args, last, case_index, true); @@ -254,9 +257,6 @@ char *GetStringWithArgs(char *buffr, StringID string, StringParameters *args, co case 30: return FormatString(buffr, GetGRFStringPtr(index + 0x1000), args, last, case_index); - - case 31: - NOT_REACHED(); } if (index >= _langtab_num[tab]) { -- cgit v1.2.3-70-g09d2