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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/bridge_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/table/settings/gui_settings.ini
This commit is contained in:
Jonathan G Rennison
2023-11-12 14:14:56 +00:00
parent 524af62b8e 536d2cb75b
commit ec6cdce0c3
73 changed files with 800 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@@ -1141,6 +1141,7 @@ static void MakeNewGameDone()
/* Overwrite color from settings if needed
* COLOUR_END corresponds to Random colour */
if (_settings_client.gui.starting_colour != COLOUR_END) {
c->colour = _settings_client.gui.starting_colour;
ResetCompanyLivery(c);
@@ -1148,6 +1149,10 @@ static void MakeNewGameDone()
BuildOwnerLegend();
}
if (_settings_client.gui.starting_colour_secondary != COLOUR_END && HasBit(_loaded_newgrf_features.used_liveries, LS_DEFAULT)) {
DoCommandP(0, LS_DEFAULT | 1 << 8, _settings_client.gui.starting_colour_secondary, CMD_SET_COMPANY_COLOUR);
}
OnStartGame(false);
InitializeRailGUI();