summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/citra/config.cpp2
-rw-r--r--src/citra_qt/config.cpp4
-rw-r--r--src/core/hle/service/ptm/ptm.cpp4
-rw-r--r--src/core/settings.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 4d170dec8..c64de8e22 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -78,7 +78,7 @@ void Config::ReadValues() {
78 Settings::values.use_virtual_sd = sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true); 78 Settings::values.use_virtual_sd = sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
79 79
80 // System 80 // System
81 Settings::values.is_new3ds = sdl2_config->GetBoolean("System", "is_new3ds", false); 81 Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false);
82 Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1); 82 Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1);
83 83
84 // Miscellaneous 84 // Miscellaneous
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index f6e498128..6e4ba3907 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -61,7 +61,7 @@ void Config::ReadValues() {
61 qt_config->endGroup(); 61 qt_config->endGroup();
62 62
63 qt_config->beginGroup("System"); 63 qt_config->beginGroup("System");
64 Settings::values.is_new3ds = qt_config->value("is_new3ds", false).toBool(); 64 Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool();
65 Settings::values.region_value = qt_config->value("region_value", 1).toInt(); 65 Settings::values.region_value = qt_config->value("region_value", 1).toInt();
66 qt_config->endGroup(); 66 qt_config->endGroup();
67 67
@@ -152,7 +152,7 @@ void Config::SaveValues() {
152 qt_config->endGroup(); 152 qt_config->endGroup();
153 153
154 qt_config->beginGroup("System"); 154 qt_config->beginGroup("System");
155 qt_config->setValue("is_new3ds", Settings::values.is_new3ds); 155 qt_config->setValue("is_new_3ds", Settings::values.is_new_3ds);
156 qt_config->setValue("region_value", Settings::values.region_value); 156 qt_config->setValue("region_value", Settings::values.region_value);
157 qt_config->endGroup(); 157 qt_config->endGroup();
158 158
diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp
index 3a0331ee1..e2c17d93b 100644
--- a/src/core/hle/service/ptm/ptm.cpp
+++ b/src/core/hle/service/ptm/ptm.cpp
@@ -91,10 +91,10 @@ void IsLegacyPowerOff(Service::Interface* self) {
91 91
92void CheckNew3DS(Service::Interface* self) { 92void CheckNew3DS(Service::Interface* self) {
93 u32* cmd_buff = Kernel::GetCommandBuffer(); 93 u32* cmd_buff = Kernel::GetCommandBuffer();
94 const bool is_new_3ds = Settings::values.is_new3ds; 94 const bool is_new_3ds = Settings::values.is_new_3ds;
95 95
96 if (is_new_3ds) { 96 if (is_new_3ds) {
97 LOG_CRITICAL(Service_PTM, "The option 'is_new3ds' is enabled as part of the 'System' settings. Citra does not fully support New3DS emulation yet!"); 97 LOG_CRITICAL(Service_PTM, "The option 'is_new_3ds' is enabled as part of the 'System' settings. Citra does not fully support New 3DS emulation yet!");
98 } 98 }
99 99
100 cmd_buff[1] = RESULT_SUCCESS.raw; 100 cmd_buff[1] = RESULT_SUCCESS.raw;
diff --git a/src/core/settings.h b/src/core/settings.h
index a61f25cbe..ea72f4d9c 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -42,7 +42,7 @@ static const std::array<Values, NUM_INPUTS> All = {{
42 42
43struct Values { 43struct Values {
44 // CheckNew3DS 44 // CheckNew3DS
45 bool is_new3ds; 45 bool is_new_3ds;
46 46
47 // Controls 47 // Controls
48 std::array<int, NativeInput::NUM_INPUTS> input_mappings; 48 std::array<int, NativeInput::NUM_INPUTS> input_mappings;