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

Add mechanism to override setting names used in config file

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-12-09 19:56:17 +00:00
parent e6a38f1d23
commit b9e322ec7a
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/settings.cpp
View File

@@ -613,6 +613,20 @@ const std::string &StringSettingDesc::Read(const void *object) const
return *reinterpret_cast<std::string *>(GetVariableAddress(object, this->save)); return *reinterpret_cast<std::string *>(GetVariableAddress(object, this->save));
} }
static const char *GetSettingConfigName(const SettingDesc &sd)
{
const char *name = sd.name;
if (sd.guiproc != nullptr) {
SettingOnGuiCtrlData data;
data.type = SOGCT_CFG_NAME;
data.str = name;
if (sd.guiproc(data)) {
name = data.str;
}
}
return name;
}
/** /**
* Load values from a group of an IniFile structure into the internal representation * Load values from a group of an IniFile structure into the internal representation
* @param ini pointer to IniFile structure that holds administrative information * @param ini pointer to IniFile structure that holds administrative information
@@ -635,7 +649,7 @@ static void IniLoadSettings(IniFile &ini, const SettingTable &settings_table, co
item = nullptr; item = nullptr;
} else { } else {
/* For settings.xx.yy load the settings from [xx] yy = ? */ /* For settings.xx.yy load the settings from [xx] yy = ? */
std::string s{ sd->name }; std::string s{ GetSettingConfigName(*sd) };
auto sc = s.find('.'); auto sc = s.find('.');
if (sc != std::string::npos) { if (sc != std::string::npos) {
group = ini.GetGroup(s.substr(0, sc)); group = ini.GetGroup(s.substr(0, sc));
@@ -656,6 +670,13 @@ static void IniLoadSettings(IniFile &ini, const SettingTable &settings_table, co
sc = s.find('.'); sc = s.find('.');
if (sc != std::string::npos) item = ini.GetGroup(s.substr(0, sc))->GetItem(s.substr(sc + 1), false); if (sc != std::string::npos) item = ini.GetGroup(s.substr(0, sc))->GetItem(s.substr(sc + 1), false);
} }
if (item == nullptr && sd->guiproc != nullptr) {
SettingOnGuiCtrlData data;
data.type = SOGCT_CFG_FALLBACK_NAME;
if (sd->guiproc(data)) {
item = group->GetItem(data.str, false);
}
}
} }
sd->ParseValue(item, object); sd->ParseValue(item, object);
@@ -719,7 +740,7 @@ static void IniSaveSettings(IniFile &ini, const SettingTable &settings_table, co
if (sd->flags & SF_NO_NEWGAME) continue; if (sd->flags & SF_NO_NEWGAME) continue;
/* XXX - wtf is this?? (group override?) */ /* XXX - wtf is this?? (group override?) */
std::string s{ sd->name }; std::string s{ GetSettingConfigName(*sd) };
auto sc = s.find('.'); auto sc = s.find('.');
if (sc != std::string::npos) { if (sc != std::string::npos) {
group = ini.GetGroup(s.substr(0, sc)); group = ini.GetGroup(s.substr(0, sc));
@@ -2209,7 +2230,7 @@ static void RemoveEntriesFromIni(IniFile &ini, const SettingTable &table)
{ {
for (auto &sd : table) { for (auto &sd : table) {
/* For settings.xx.yy load the settings from [xx] yy = ? */ /* For settings.xx.yy load the settings from [xx] yy = ? */
std::string s{ sd->name }; std::string s{ GetSettingConfigName(*sd) };
auto sc = s.find('.'); auto sc = s.find('.');
if (sc == std::string::npos) continue; if (sc == std::string::npos) continue;

3
src/settings_internal.h
View File

@@ -77,12 +77,15 @@ enum SettingType {
enum SettingOnGuiCtrlType { enum SettingOnGuiCtrlType {
SOGCT_DESCRIPTION_TEXT, ///< Description text callback SOGCT_DESCRIPTION_TEXT, ///< Description text callback
SOGCT_GUI_DROPDOWN_ORDER, ///< SF_GUI_DROPDOWN reordering callback SOGCT_GUI_DROPDOWN_ORDER, ///< SF_GUI_DROPDOWN reordering callback
SOGCT_CFG_NAME, ///< Config file name override
SOGCT_CFG_FALLBACK_NAME, ///< Config file name within group fallback
}; };
struct SettingOnGuiCtrlData { struct SettingOnGuiCtrlData {
SettingOnGuiCtrlType type; SettingOnGuiCtrlType type;
StringID text; StringID text;
int val; int val;
const char *str = nullptr;
}; };
struct IniItem; struct IniItem;