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

Codechange: pass zero length arguments for {STRING}, instead of the remaining arguments

pull/11006/head
Rubidium 2023-06-13 15:49:12 +02:00 committed by rubidium42
parent 82851a9bef
commit e332810231
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/strings.cpp
View File

@ -1087,10 +1087,8 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
case SCC_STRING: {// {STRING} case SCC_STRING: {// {STRING}
StringID string_id = args->GetInt32(SCC_STRING); StringID string_id = args->GetInt32(SCC_STRING);
if (game_script && GetStringTab(string_id) != TEXT_TAB_GAMESCRIPT_START) break; if (game_script && GetStringTab(string_id) != TEXT_TAB_GAMESCRIPT_START) break;
/* WARNING. It's prohibited for the included string to consume any arguments. /* It's prohibited for the included string to consume any arguments. */
* For included strings that consume argument, you should use STRING1, STRING2 etc. StringParameters tmp_params(*args, 0);
* To debug stuff you can set argv to nullptr and it will tell you */
StringParameters tmp_params(args->GetDataPointer(), args->GetDataLeft(), nullptr);
GetStringWithArgs(builder, string_id, &tmp_params, next_substr_case_index, game_script); GetStringWithArgs(builder, string_id, &tmp_params, next_substr_case_index, game_script);
next_substr_case_index = 0; next_substr_case_index = 0;
break; break;