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

Merge branch 'master' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
This commit is contained in:
Jonathan G Rennison
2021-10-18 00:31:37 +01:00
parent 784fcbd1e7 4d74e51907
commit 406b81abb1
21 changed files with 636 additions and 1034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_config.cpp
View File

@@ -292,15 +292,13 @@ void GRFParameterInfo::Finalize()
/**
* Update the palettes of the graphics from the config file.
* Called when changing the default palette in advanced settings.
* @param p1 Unused.
* @return Always true.
* @param new_value Unused.
*/
bool UpdateNewGRFConfigPalette(int32 p1)
void UpdateNewGRFConfigPalette(int32 new_value)
{
for (GRFConfig *c = _grfconfig_newgame; c != nullptr; c = c->next) c->SetSuitablePalette();
for (GRFConfig *c = _grfconfig_static; c != nullptr; c = c->next) c->SetSuitablePalette();
for (GRFConfig *c = _all_grfs; c != nullptr; c = c->next) c->SetSuitablePalette();
return true;
}
/**