gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23422) -Fix [FS#4863] (r22797): the default palette setting wasn't applied correctly anymore as the configuration file is loaded after the first NewGRF scan

Browse Source
This commit is contained in:
rubidium 2011-12-04 11:18:43 +00:00
parent 87fdac852c
commit 5891099f24
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/newgrf_config.h
View File

@ -240,5 +240,6 @@ GRFTextWrapper *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
void UpdateNewGRFScanStatus(uint num, const char *name); void UpdateNewGRFScanStatus(uint num, const char *name);
bool UpdateNewGRFConfigPalette(int32 p1 = 0);
#endif /* NEWGRF_CONFIG_H */ #endif /* NEWGRF_CONFIG_H */

3
src/openttd.cpp
View File

@ -398,6 +398,9 @@ struct AfterNewGRFScan : NewGRFScanCallback {
uint last_newgrf_count = _settings_client.gui.last_newgrf_count; uint last_newgrf_count = _settings_client.gui.last_newgrf_count;
LoadFromConfig(); LoadFromConfig();
_settings_client.gui.last_newgrf_count = last_newgrf_count; _settings_client.gui.last_newgrf_count = last_newgrf_count;
/* Since the default for the palette might have changed due to
* reading the configuration file, recalculate that now. */
UpdateNewGRFConfigPalette();
AI::Uninitialize(true); AI::Uninitialize(true);
CheckConfig(); CheckConfig();

1
src/table/settings.ini
View File

@ -40,7 +40,6 @@ static bool InvalidateIndustryViewWindow(int32 p1);
static bool InvalidateAISettingsWindow(int32 p1); static bool InvalidateAISettingsWindow(int32 p1);
static bool RedrawTownAuthority(int32 p1); static bool RedrawTownAuthority(int32 p1);
static bool InvalidateCompanyInfrastructureWindow(int32 p1); static bool InvalidateCompanyInfrastructureWindow(int32 p1);
extern bool UpdateNewGRFConfigPalette(int32 p1);
static bool ZoomMinMaxChanged(int32 p1); static bool ZoomMinMaxChanged(int32 p1);
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK