summaryrefslogtreecommitdiff
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
authorGravatar wwylele2016-05-13 18:32:43 +0300
committerGravatar wwylele2016-05-15 13:24:22 +0300
commit416faa20d1156ac4e8646710e9c1f9565c0ed14b (patch)
tree8bc07be0343eea7f028c9a6ba52fee55d5ba0f1f /src/citra/config.cpp
parentRefactor input subsystem (diff)
downloadyuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar.gz
yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar.xz
yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.zip
implement circle pad modifier
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 4f6d0a464..fb8dd9ba3 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -53,6 +53,7 @@ static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = {
53 53
54 // indirectly mapped keys 54 // indirectly mapped keys
55 SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, 55 SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT,
56 SDL_SCANCODE_D,
56}; 57};
57 58
58void Config::ReadValues() { 59void Config::ReadValues() {
@@ -61,6 +62,7 @@ void Config::ReadValues() {
61 Settings::values.input_mappings[Settings::NativeInput::All[i]] = 62 Settings::values.input_mappings[Settings::NativeInput::All[i]] =
62 sdl2_config->GetInteger("Controls", Settings::NativeInput::Mapping[i], defaults[i]); 63 sdl2_config->GetInteger("Controls", Settings::NativeInput::Mapping[i], defaults[i]);
63 } 64 }
65 Settings::values.pad_circle_modifier_scale = (float)sdl2_config->GetReal("Controls", "pad_circle_modifier_scale", 0.5);
64 66
65 // Core 67 // Core
66 Settings::values.frame_skip = sdl2_config->GetInteger("Core", "frame_skip", 0); 68 Settings::values.frame_skip = sdl2_config->GetInteger("Core", "frame_skip", 0);