diff options
| author | Pavel Stupnikov <dp@dpointer.org> | 2018-04-17 20:41:31 +0300 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2018-04-17 18:41:31 +0100 |
| commit | 9175c349dac23cb236aa981e93bac28a4857c19e (patch) | |
| tree | 1c29c42f7072c97e0c0e8d21a3c7d9c716b90400 /src/table | |
| parent | 4d6a5fbec48d0b9967c219c6614566b5a0ef8baa (diff) | |
| download | openttd-9175c349dac23cb236aa981e93bac28a4857c19e.tar.xz | |
Fix #6465: Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings (#6726)
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/control_codes.h | 10 | ||||
| -rw-r--r-- | src/table/strgen_tables.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/table/control_codes.h b/src/table/control_codes.h index d6b1ad6f4..ad620197a 100644 --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -26,9 +26,13 @@ enum StringControlCode { /* This must be the first entry. It's encoded in strings that are saved. */ SCC_ENCODED = SCC_CONTROL_START, - /* Display control codes */ - SCC_TINYFONT, ///< Switch to small font - SCC_BIGFONT, ///< Switch to large font + /* Font selection codes, must be in same order as FontSize enum */ + SCC_FIRST_FONT, + SCC_NORMALFONT = SCC_FIRST_FONT, ///< Switch to normal size font + SCC_TINYFONT, ///< Switch to small font + SCC_BIGFONT, ///< Switch to large font + SCC_MONOFONT, ///< Switch to monospaced font + SCC_LAST_FONT = SCC_MONOFONT, /* Formatting control codes */ SCC_REVISION, diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h index 322f1bc6b..d4294fa84 100644 --- a/src/table/strgen_tables.h +++ b/src/table/strgen_tables.h @@ -37,8 +37,10 @@ extern void EmitGender(Buffer *buffer, char *buf, int value); static const CmdStruct _cmd_structs[] = { /* Font size */ + {"NORMAL_FONT", EmitSingleChar, SCC_NORMALFONT, 0, -1, C_NONE}, {"TINY_FONT", EmitSingleChar, SCC_TINYFONT, 0, -1, C_NONE}, {"BIG_FONT", EmitSingleChar, SCC_BIGFONT, 0, -1, C_NONE}, + {"MONO_FONT", EmitSingleChar, SCC_MONOFONT, 0, -1, C_NONE}, /* Colours */ {"BLUE", EmitSingleChar, SCC_BLUE, 0, -1, C_DONTCOUNT}, |