thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-12-23 08:22:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: make definitions global

Browse source
This commit is contained in:
Hyper 2024-11-15 19:57:44 +00:00
parent 784d3973f4
commit b354c6123d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UnleashedRecomp/config.cpp
View file

@ -14,7 +14,7 @@ void Config::Load()
{ {
auto toml = toml::parse_file(configPath.string()); auto toml = toml::parse_file(configPath.string());
for (auto def : Definitions) for (auto def : g_configDefs)
{ {
def->ReadValue(toml); def->ReadValue(toml);
#if _DEBUG #if _DEBUG
@ -38,7 +38,7 @@ void Config::Save()
std::string result; std::string result;
std::string section; std::string section;
for (auto def : Definitions) for (auto def : g_configDefs)
{ {
auto isFirstSection = section.empty(); auto isFirstSection = section.empty();
auto isDefWithSection = section != def->GetSection(); auto isDefWithSection = section != def->GetSection();

2
UnleashedRecomp/config.h
View file

@ -5,8 +5,6 @@
class Config class Config
{ {
public: public:
inline static std::vector<ConfigDefBase*> Definitions{};
CONFIG_DEFINE_ENUM("System", ELanguage, Language, ELanguage::English); CONFIG_DEFINE_ENUM("System", ELanguage, Language, ELanguage::English);
CONFIG_DEFINE("System", bool, Hints, true); CONFIG_DEFINE("System", bool, Hints, true);
CONFIG_DEFINE("System", bool, ControlTutorial, true); CONFIG_DEFINE("System", bool, ControlTutorial, true);

10
UnleashedRecomp/config_detail.h
View file

@ -42,6 +42,8 @@ public:
virtual std::string ToString() const = 0; virtual std::string ToString() const = 0;
}; };
inline static std::vector<ConfigDefBase*> g_configDefs{};
template<typename T, bool isMenuOption = true> template<typename T, bool isMenuOption = true>
class ConfigDef : public ConfigDefBase class ConfigDef : public ConfigDefBase
{ {
@ -61,7 +63,7 @@ public:
ConfigDef(std::string section, std::string name, T defaultValue) ConfigDef(std::string section, std::string name, T defaultValue)
: Section(section), Name(name), DefaultValue(defaultValue) : Section(section), Name(name), DefaultValue(defaultValue)
{ {
Config::Definitions.emplace_back(this); g_configDefs.emplace_back(this);
} }
ConfigDef(std::string section, std::string name, T defaultValue, std::unordered_map<std::string, T> enumTemplate) ConfigDef(std::string section, std::string name, T defaultValue, std::unordered_map<std::string, T> enumTemplate)
@ -70,19 +72,19 @@ public:
for (const auto& pair : EnumTemplate) for (const auto& pair : EnumTemplate)
EnumTemplateReverse[pair.second] = pair.first; EnumTemplateReverse[pair.second] = pair.first;
Config::Definitions.emplace_back(this); g_configDefs.emplace_back(this);
} }
ConfigDef(std::string section, std::string name, T defaultValue, std::function<void(ConfigDef<T, isMenuOption>*)> readCallback) ConfigDef(std::string section, std::string name, T defaultValue, std::function<void(ConfigDef<T, isMenuOption>*)> readCallback)
: Section(section), Name(name), DefaultValue(defaultValue), ReadCallback(readCallback) : Section(section), Name(name), DefaultValue(defaultValue), ReadCallback(readCallback)
{ {
Config::Definitions.emplace_back(this); g_configDefs.emplace_back(this);
} }
ConfigDef(std::string section, std::string name, T defaultValue, std::function<void(ConfigDef<T, isMenuOption>*, const toml::v3::table&)> readImpl) ConfigDef(std::string section, std::string name, T defaultValue, std::function<void(ConfigDef<T, isMenuOption>*, const toml::v3::table&)> readImpl)
: Section(section), Name(name), DefaultValue(defaultValue), ReadImpl(readImpl) : Section(section), Name(name), DefaultValue(defaultValue), ReadImpl(readImpl)
{ {
Config::Definitions.emplace_back(this); g_configDefs.emplace_back(this);
} }
void ReadValue(toml::v3::ex::parse_result& toml) override void ReadValue(toml::v3::ex::parse_result& toml) override