dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a STRING8 format code

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-24 02:10:42 +00:00
parent dd5d4c795b
commit a7094fec3b
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/strgen/strgen_base.cpp
View File

@@ -639,6 +639,7 @@ static const CmdStruct *TranslateCmdForCompare(const CmdStruct *a)
strcmp(a->cmd, "STRING5") == 0 || strcmp(a->cmd, "STRING5") == 0 ||
strcmp(a->cmd, "STRING6") == 0 || strcmp(a->cmd, "STRING6") == 0 ||
strcmp(a->cmd, "STRING7") == 0 || strcmp(a->cmd, "STRING7") == 0 ||
strcmp(a->cmd, "STRING8") == 0 ||
strcmp(a->cmd, "RAW_STRING") == 0) { strcmp(a->cmd, "RAW_STRING") == 0) {
return FindCmd("STRING", 6); return FindCmd("STRING", 6);
} }

3
src/strings.cpp
View File

@@ -1299,7 +1299,8 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
case SCC_STRING4: case SCC_STRING4:
case SCC_STRING5: case SCC_STRING5:
case SCC_STRING6: case SCC_STRING6:
case SCC_STRING7: { // {STRING1..7} case SCC_STRING7:
case SCC_STRING8: { // {STRING1..8}
/* Strings that consume arguments */ /* Strings that consume arguments */
StringID str = args->GetInt32(b); StringID str = args->GetInt32(b);
if (game_script && GetStringTab(str) != TEXT_TAB_GAMESCRIPT_START) break; if (game_script && GetStringTab(str) != TEXT_TAB_GAMESCRIPT_START) break;

1
src/table/control_codes.h
View File

@@ -89,6 +89,7 @@ enum StringControlCode {
SCC_STRING5, SCC_STRING5,
SCC_STRING6, SCC_STRING6,
SCC_STRING7, SCC_STRING7,
SCC_STRING8,
SCC_STRING, SCC_STRING,

1
src/table/strgen_tables.h
View File

@@ -70,6 +70,7 @@ static const CmdStruct _cmd_structs[] = {
{"STRING5", EmitSingleChar, SCC_STRING5, 6, -1, C_CASE | C_GENDER}, // included string that consumes the string id and FIVE arguments {"STRING5", EmitSingleChar, SCC_STRING5, 6, -1, C_CASE | C_GENDER}, // included string that consumes the string id and FIVE arguments
{"STRING6", EmitSingleChar, SCC_STRING6, 7, -1, C_CASE | C_GENDER}, // included string that consumes the string id and SIX arguments {"STRING6", EmitSingleChar, SCC_STRING6, 7, -1, C_CASE | C_GENDER}, // included string that consumes the string id and SIX arguments
{"STRING7", EmitSingleChar, SCC_STRING7, 8, -1, C_CASE | C_GENDER}, // included string that consumes the string id and SEVEN arguments {"STRING7", EmitSingleChar, SCC_STRING7, 8, -1, C_CASE | C_GENDER}, // included string that consumes the string id and SEVEN arguments
{"STRING8", EmitSingleChar, SCC_STRING8, 9, -1, C_CASE | C_GENDER}, // included string that consumes the string id and EIGHT arguments
{"STATION_FEATURES", EmitSingleChar, SCC_STATION_FEATURES, 1, -1, C_NONE}, // station features string, icons of the features {"STATION_FEATURES", EmitSingleChar, SCC_STATION_FEATURES, 1, -1, C_NONE}, // station features string, icons of the features
{"INDUSTRY", EmitSingleChar, SCC_INDUSTRY_NAME, 1, -1, C_CASE | C_GENDER}, // industry, takes an industry #, can have cases {"INDUSTRY", EmitSingleChar, SCC_INDUSTRY_NAME, 1, -1, C_CASE | C_GENDER}, // industry, takes an industry #, can have cases