Merge branch 'cpp-11' into save_ext

2019-01-13 23:30:52 +00:00
parent 0dba091d79 d86aa7719b
commit 4a162c5502
144 changed files with 1021 additions and 328 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2764,6 +2764,18 @@ strhelp  = STR_CONFIG_SETTING_LIVERIES_HELPTEXT
 strval   = STR_CONFIG_SETTING_LIVERIES_NONE
 proc     = InvalidateCompanyLiveryWindow

+[SDTC_VAR]
+var      = gui.starting_colour
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = COLOUR_END
+min      = 0
+max      = COLOUR_END
+str      = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR
+strhelp  = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT
+strval   = STR_COLOUR_DARK_BLUE
+
 [SDTC_BOOL]
 var      = gui.prefer_teamchat
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC