From 50252cb5df047396067ede6a8b0843a3244733c4 Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 18 Apr 2025 18:44:58 +0200 Subject: [PATCH] Codechange: Ini(Load|Save)WindowSettings expect a WindowDesc*, no void*. (#14029) --- src/settings.cpp | 4 ++-- src/settings_func.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/settings.cpp b/src/settings.cpp index 9cd14a2da7..c04cde0a46 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -878,7 +878,7 @@ static void IniSaveSettingList(IniFile &ini, const char *grpname, StringList &li * @param grpname character string identifying the section-header of the ini file that will be parsed * @param desc Destination WindowDesc */ -void IniLoadWindowSettings(IniFile &ini, const char *grpname, void *desc) +void IniLoadWindowSettings(IniFile &ini, const char *grpname, WindowDesc *desc) { IniLoadSettings(ini, _window_settings, grpname, desc, false); } @@ -889,7 +889,7 @@ void IniLoadWindowSettings(IniFile &ini, const char *grpname, void *desc) * @param grpname character string identifying the section-header of the ini file * @param desc Source WindowDesc */ -void IniSaveWindowSettings(IniFile &ini, const char *grpname, void *desc) +void IniSaveWindowSettings(IniFile &ini, const char *grpname, WindowDesc *desc) { IniSaveSettings(ini, _window_settings, grpname, desc, false); } diff --git a/src/settings_func.h b/src/settings_func.h index 935cf2d82b..034a37ef12 100644 --- a/src/settings_func.h +++ b/src/settings_func.h @@ -15,6 +15,7 @@ #include "newgrf_config.h" struct IniFile; +struct WindowDesc; void IConsoleSetSetting(const char *name, const char *value, bool force_newgame = false); void IConsoleSetSetting(const char *name, int32_t value); @@ -24,8 +25,8 @@ void IConsoleListSettings(const char *prefilter); void LoadFromConfig(bool minimal = false); void SaveToConfig(); -void IniLoadWindowSettings(IniFile &ini, const char *grpname, void *desc); -void IniSaveWindowSettings(IniFile &ini, const char *grpname, void *desc); +void IniLoadWindowSettings(IniFile &ini, const char *grpname, WindowDesc *desc); +void IniSaveWindowSettings(IniFile &ini, const char *grpname, WindowDesc *desc); StringList GetGRFPresetList(); GRFConfigList LoadGRFPresetFromConfig(const char *config_name);