summaryrefslogtreecommitdiff
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2017-08-29 11:29:10 -0400
committerGravatar GitHub2017-08-29 11:29:10 -0400
commit75cd28a7cc1c73e1be1fc72d4b86b267cbb79081 (patch)
tree18f3e7e5b864511da54d847e645dd23a69033924 /src/citra/config.cpp
parentMerge pull request #2905 from danzel/fix-2902 (diff)
parentEmuWindow: refactor touch input into a TouchDevice (diff)
downloadyuzu-75cd28a7cc1c73e1be1fc72d4b86b267cbb79081.tar.gz
yuzu-75cd28a7cc1c73e1be1fc72d4b86b267cbb79081.tar.xz
yuzu-75cd28a7cc1c73e1be1fc72d4b86b267cbb79081.zip
Merge pull request #2899 from wwylele/touch-refactor
Refactor touch input into a TouchDevice
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r--src/citra/config.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 3869b6b5d..a48ef08c7 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -78,6 +78,8 @@ void Config::ReadValues() {
78 78
79 Settings::values.motion_device = sdl2_config->Get( 79 Settings::values.motion_device = sdl2_config->Get(
80 "Controls", "motion_device", "engine:motion_emu,update_period:100,sensitivity:0.01"); 80 "Controls", "motion_device", "engine:motion_emu,update_period:100,sensitivity:0.01");
81 Settings::values.touch_device =
82 sdl2_config->Get("Controls", "touch_device", "engine:emu_window");
81 83
82 // Core 84 // Core
83 Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); 85 Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);