Merge PR #274 into jgrpp

src/table/control_codes.h

@@ -96,6 +96,7 @@ enum StringControlCode {
 	SCC_DECIMAL,
 	SCC_DECIMAL1,
 	SCC_NUM,
+	SCC_PLUS_NUM,
 	SCC_ZEROFILL_NUM,
 	SCC_HEX,
 	SCC_BYTES,

src/table/settings.ini

@@ -5468,6 +5468,19 @@ strhelp  = STR_CONFIG_SETTING_SHADED_TREES_ON_SLOPES_HELPTEXT
 proc     = RedrawScreen
 cat      = SC_BASIC
 
+[SDTC_VAR]
+var      = gui.station_rating_tooltip_mode
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+min      = 0
+max      = 2
+str      = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE
+strhelp  = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_HELPTEXT
+strval   = STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_OFF
+cat      = SC_BASIC
+
 ; For the dedicated build we'll enable dates in logs by default.
 [SDTC_BOOL]
 ifdef    = DEDICATED

src/table/strgen_tables.h

@@ -111,6 +111,7 @@ static const CmdStruct _cmd_structs[] = {
 	{"DECIMAL",           EmitSingleChar, SCC_DECIMAL,            2,  0, C_NONE}, // Number with comma and fractional part. Second parameter is number of fractional digits, first parameter is number times 10**(second parameter).
 	{"DECIMAL1",          EmitSingleChar, SCC_DECIMAL1,           1,  0, C_NONE}, // Decimal with fixed second parameter of 1
 	{"NUM",               EmitSingleChar, SCC_NUM,                1,  0, C_NONE}, // Signed number
+	{"PLUS_NUM",          EmitSingleChar, SCC_PLUS_NUM,           1,  0, C_NONE}, // Signed number, with sign (+ or -) shown for both positive and negative numbers
 	{"ZEROFILL_NUM",      EmitSingleChar, SCC_ZEROFILL_NUM,       2,  0, C_NONE}, // Unsigned number with zero fill, e.g. "02". First parameter is number, second minimum length
 	{"BYTES",             EmitSingleChar, SCC_BYTES,              1,  0, C_NONE}, // Unsigned number with "bytes", i.e. "1.02 MiB or 123 KiB"
 	{"HEX",               EmitSingleChar, SCC_HEX,                1,  0, C_NONE}, // Hexadecimally printed number