diff options
Diffstat (limited to 'src')
| -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); | |||
| 63 | #undef SWITCHABLE | 63 | #undef SWITCHABLE |
| 64 | 64 | ||
| 65 | Values values; | 65 | Values values; |
| 66 | static bool configuring_global = true; | ||
| 67 | 66 | ||
| 68 | std::string GetTimeZoneString() { | 67 | std::string GetTimeZoneString() { |
| 69 | const auto time_zone_index = static_cast<std::size_t>(values.time_zone_index.GetValue()); | 68 | const auto time_zone_index = static_cast<std::size_t>(values.time_zone_index.GetValue()); |
| @@ -131,14 +130,6 @@ void LogSettings() { | |||
| 131 | log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir)); | 130 | log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir)); |
| 132 | } | 131 | } |
| 133 | 132 | ||
| 134 | bool IsConfiguringGlobal() { | ||
| 135 | return configuring_global; | ||
| 136 | } | ||
| 137 | |||
| 138 | void SetConfiguringGlobal(bool is_global) { | ||
| 139 | configuring_global = is_global; | ||
| 140 | } | ||
| 141 | |||
| 142 | bool IsGPULevelExtreme() { | 133 | bool IsGPULevelExtreme() { |
| 143 | return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme; | 134 | return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme; |
| 144 | } | 135 | } |
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 { | |||
| 450 | 450 | ||
| 451 | extern Values values; | 451 | extern Values values; |
| 452 | 452 | ||
| 453 | bool IsConfiguringGlobal(); | ||
| 454 | void SetConfiguringGlobal(bool is_global); | ||
| 455 | |||
| 456 | bool IsGPULevelExtreme(); | 453 | bool IsGPULevelExtreme(); |
| 457 | bool IsGPULevelHigh(); | 454 | bool IsGPULevelHigh(); |
| 458 | 455 | ||
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 { | |||
| 42 | return label; | 42 | return label; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | static bool configuring_global = true; | ||
| 46 | |||
| 47 | bool IsConfiguringGlobal() { | ||
| 48 | return configuring_global; | ||
| 49 | } | ||
| 50 | |||
| 51 | void SetConfiguringGlobal(bool is_global) { | ||
| 52 | configuring_global = is_global; | ||
| 53 | } | ||
| 54 | |||
| 45 | } // namespace Settings | 55 | } // 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 { | |||
| 43 | MaxEnum, | 43 | MaxEnum, |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | bool IsConfiguringGlobal(); | ||
| 47 | void SetConfiguringGlobal(bool is_global); | ||
| 48 | |||
| 46 | class BasicSetting; | 49 | class BasicSetting; |
| 47 | 50 | ||
| 48 | class Linkage { | 51 | class Linkage { |