VERY experimental Nintendo Switch 2 emulator
C++
settings: Move IsConfiguringGlobal to settings_common
lat9nq8d4c466cdec3
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex d98dd29256..a1cc76a38a 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -63,7 +63,6 @@ SWITCHABLE(u8, true);#undef SWITCHABLEValues 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.hindex e03233eaf8..afda3ccaf6 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.cppindex a7ce995154..fb42991fa9 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 Settingsdiff --git a/src/common/settings_common.h b/src/common/settings_common.hindex 81d59115d3..9d1044a195 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 {