mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Ini(Load|Save)WindowSettings expect a WindowDesc*, no void*. (#14029)

pull/14034/head
frosch 2025-04-18 18:44:58 +02:00 committed by GitHub
parent 394adb654e
commit 50252cb5df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings.cpp
View File

@ -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 grpname character string identifying the section-header of the ini file that will be parsed
* @param desc Destination WindowDesc * @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); 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 grpname character string identifying the section-header of the ini file
* @param desc Source WindowDesc * @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); IniSaveSettings(ini, _window_settings, grpname, desc, false);
} }

5
src/settings_func.h
View File

@ -15,6 +15,7 @@
#include "newgrf_config.h" #include "newgrf_config.h"
struct IniFile; struct IniFile;
struct WindowDesc;
void IConsoleSetSetting(const char *name, const char *value, bool force_newgame = false); void IConsoleSetSetting(const char *name, const char *value, bool force_newgame = false);
void IConsoleSetSetting(const char *name, int32_t value); void IConsoleSetSetting(const char *name, int32_t value);
@ -24,8 +25,8 @@ void IConsoleListSettings(const char *prefilter);
void LoadFromConfig(bool minimal = false); void LoadFromConfig(bool minimal = false);
void SaveToConfig(); void SaveToConfig();
void IniLoadWindowSettings(IniFile &ini, const char *grpname, void *desc); void IniLoadWindowSettings(IniFile &ini, const char *grpname, WindowDesc *desc);
void IniSaveWindowSettings(IniFile &ini, const char *grpname, void *desc); void IniSaveWindowSettings(IniFile &ini, const char *grpname, WindowDesc *desc);
StringList GetGRFPresetList(); StringList GetGRFPresetList();
GRFConfigList LoadGRFPresetFromConfig(const char *config_name); GRFConfigList LoadGRFPresetFromConfig(const char *config_name);