diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-06-14 01:37:41 +0200 |
---|---|---|
committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-21 16:56:54 +0200 |
commit | b4f2ad3ff5c49549bc72997360c31d0662a97439 (patch) | |
tree | 71a6cfc62fd2aca84c10832ea0485ebaf4b12c47 | |
parent | configuration/shared: Clean up includes [IWYU] (diff) | |
download | yuzu-b4f2ad3ff5c49549bc72997360c31d0662a97439.tar yuzu-b4f2ad3ff5c49549bc72997360c31d0662a97439.tar.gz yuzu-b4f2ad3ff5c49549bc72997360c31d0662a97439.tar.bz2 yuzu-b4f2ad3ff5c49549bc72997360c31d0662a97439.tar.lz yuzu-b4f2ad3ff5c49549bc72997360c31d0662a97439.tar.xz yuzu-b4f2ad3ff5c49549bc72997360c31d0662a97439.tar.zst yuzu-b4f2ad3ff5c49549bc72997360c31d0662a97439.zip |
-rw-r--r-- | src/common/settings.cpp | 9 | ||||
-rw-r--r-- | src/common/settings.h | 3 | ||||
-rw-r--r-- | src/common/settings_common.cpp | 10 | ||||
-rw-r--r-- | src/common/settings_common.h | 3 |
4 files changed, 13 insertions, 12 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index d98dd2925..a1cc76a38 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -63,7 +63,6 @@ SWITCHABLE(u8, true); #undef SWITCHABLE Values values; -static bool configuring_global = true; std::string GetTimeZoneString() { const auto time_zone_index = static_cast<std::size_t>(values.time_zone_index.GetValue()); @@ -131,14 +130,6 @@ void LogSettings() { log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir)); } -bool IsConfiguringGlobal() { - return configuring_global; -} - -void SetConfiguringGlobal(bool is_global) { - configuring_global = is_global; -} - bool IsGPULevelExtreme() { return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme; } diff --git a/src/common/settings.h b/src/common/settings.h index e03233eaf..afda3ccaf 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -450,9 +450,6 @@ struct Values { extern Values values; -bool IsConfiguringGlobal(); -void SetConfiguringGlobal(bool is_global); - bool IsGPULevelExtreme(); bool IsGPULevelHigh(); diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp index a7ce99515..fb42991fa 100644 --- a/src/common/settings_common.cpp +++ b/src/common/settings_common.cpp @@ -42,4 +42,14 @@ const std::string& BasicSetting::GetLabel() const { return label; } +static bool configuring_global = true; + +bool IsConfiguringGlobal() { + return configuring_global; +} + +void SetConfiguringGlobal(bool is_global) { + configuring_global = is_global; +} + } // namespace Settings diff --git a/src/common/settings_common.h b/src/common/settings_common.h index 81d59115d..9d1044a19 100644 --- a/src/common/settings_common.h +++ b/src/common/settings_common.h @@ -43,6 +43,9 @@ enum class Category : u32 { MaxEnum, }; +bool IsConfiguringGlobal(); +void SetConfiguringGlobal(bool is_global); + class BasicSetting; class Linkage { |