summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-11-16 09:54:22 +0000
committerrubidium <rubidium@openttd.org>2013-11-16 09:54:22 +0000
commita25ecfd982f0a29a749f93ede2a2b5c9cc4408e9 (patch)
tree4c62360641052829b300aa135b3fa9ff5096a555
parentd7af679fd6811f2909ad574cd73d181d064ac7f3 (diff)
downloadopenttd-a25ecfd982f0a29a749f93ede2a2b5c9cc4408e9.tar.xz
(svn r26007) -Change: make handling strings coming from game scripts slightly more lenient, i.e. less 'fatal error... must quit'
-rw-r--r--src/strings.cpp8
1 files 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]) {