mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26007) -Change: make handling strings coming from game scripts slightly more lenient, i.e. less 'fatal error... must quit'

release/1.4
rubidium 2013-11-16 09:54:22 +00:00
parent d7af679fd6
commit a25ecfd982
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/strings.cpp
View File

@ -233,7 +233,10 @@ char *GetStringWithArgs(char *buffr, StringID string, StringParameters *args, co
case 15: case 15:
/* Old table for custom names. This is no longer used */ /* 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: case GAME_TEXT_TAB:
return FormatString(buffr, GetGameStringPtr(index), args, last, case_index, true); 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: case 30:
return FormatString(buffr, GetGRFStringPtr(index + 0x1000), args, last, case_index); return FormatString(buffr, GetGRFStringPtr(index + 0x1000), args, last, case_index);
case 31:
NOT_REACHED();
} }
if (index >= _langtab_num[tab]) { if (index >= _langtab_num[tab]) {