summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/config.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-03-27 10:22:08 -0400
committerGravatar GitHub2018-03-27 10:22:08 -0400
commita5e9745380bf9e247d34c42009cd9eb66f4e97a8 (patch)
tree3c31fcb4375793542daff053665be555c2dfaa7f /src/yuzu_cmd/config.cpp
parentMerge pull request #282 from N00byKing/patch-2 (diff)
parentsettings: Remove unused CpuCore class. (diff)
downloadyuzu-a5e9745380bf9e247d34c42009cd9eb66f4e97a8.tar.gz
yuzu-a5e9745380bf9e247d34c42009cd9eb66f4e97a8.tar.xz
yuzu-a5e9745380bf9e247d34c42009cd9eb66f4e97a8.zip
Merge pull request #284 from bunnei/docked-config
Add config for "Docked" mode and various settings cleanup
Diffstat (limited to 'src/yuzu_cmd/config.cpp')
-rw-r--r--src/yuzu_cmd/config.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 342ad3850..8b479bc6d 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -90,8 +90,7 @@ void Config::ReadValues() {
90 sdl2_config->Get("Controls", "touch_device", "engine:emu_window"); 90 sdl2_config->Get("Controls", "touch_device", "engine:emu_window");
91 91
92 // Core 92 // Core
93 Settings::values.cpu_core = 93 Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);
94 static_cast<Settings::CpuCore>(sdl2_config->GetInteger("Core", "cpu_core", 1));
95 94
96 // Renderer 95 // Renderer
97 Settings::values.resolution_factor = 96 Settings::values.resolution_factor =
@@ -107,6 +106,9 @@ void Config::ReadValues() {
107 Settings::values.use_virtual_sd = 106 Settings::values.use_virtual_sd =
108 sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true); 107 sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
109 108
109 // System
110 Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", true);
111
110 // Miscellaneous 112 // Miscellaneous
111 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); 113 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace");
112 114