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

Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-04-27 02:42:20 +01:00
parent b7ce21038a f42cc19aad 4bcd05a620 1e6b57675b
commit 1fe0bb76b9
120 changed files with 2652 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/table/control_codes.h
View File

@@ -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,
@@ -120,7 +124,8 @@ enum StringControlCode {
SCC_GRAY,
SCC_DKBLUE,
SCC_BLACK,
SCC_PREVIOUS_COLOUR,
SCC_PUSH_COLOUR,
SCC_POP_COLOUR,
SCC_CONSUME_ARG,

5
src/table/strgen_tables.h
View File

@@ -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},
@@ -58,7 +60,8 @@ static const CmdStruct _cmd_structs[] = {
{"GRAY", EmitSingleChar, SCC_GRAY, 0, -1, C_DONTCOUNT},
{"DKBLUE", EmitSingleChar, SCC_DKBLUE, 0, -1, C_DONTCOUNT},
{"BLACK", EmitSingleChar, SCC_BLACK, 0, -1, C_DONTCOUNT},
{"PREVIOUS_COLOUR", EmitSingleChar, SCC_PREVIOUS_COLOUR, 0, -1, C_DONTCOUNT},
{"PUSH_COLOUR", EmitSingleChar, SCC_PUSH_COLOUR, 0, -1, C_DONTCOUNT},
{"POP_COLOUR", EmitSingleChar, SCC_POP_COLOUR, 0, -1, C_DONTCOUNT},
{"REV", EmitSingleChar, SCC_REVISION, 0, -1, C_NONE}, // openttd revision string