diff options
author | bunnei <bunneidev@gmail.com> | 2016-06-11 04:28:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 04:28:58 +0200 |
commit | f99961581ee129c44625dbd8890fab349253271a (patch) | |
tree | 9a2610d391d795b533054a91c22763e869bdd62b /src/citra/config.cpp | |
parent | Merge pull request #1896 from citra-emu/revert-1893-interpreter-split (diff) | |
parent | fixup! fixup! Refactor input system (diff) | |
download | yuzu-f99961581ee129c44625dbd8890fab349253271a.tar yuzu-f99961581ee129c44625dbd8890fab349253271a.tar.gz yuzu-f99961581ee129c44625dbd8890fab349253271a.tar.bz2 yuzu-f99961581ee129c44625dbd8890fab349253271a.tar.lz yuzu-f99961581ee129c44625dbd8890fab349253271a.tar.xz yuzu-f99961581ee129c44625dbd8890fab349253271a.tar.zst yuzu-f99961581ee129c44625dbd8890fab349253271a.zip |
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r-- | src/citra/config.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index c64de8e22..22cb51ea8 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -44,12 +44,16 @@ bool Config::LoadINI(const std::string& default_contents, bool retry) { } static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = { + // directly mapped keys SDL_SCANCODE_A, SDL_SCANCODE_S, SDL_SCANCODE_Z, SDL_SCANCODE_X, SDL_SCANCODE_Q, SDL_SCANCODE_W, SDL_SCANCODE_1, SDL_SCANCODE_2, SDL_SCANCODE_M, SDL_SCANCODE_N, SDL_SCANCODE_B, SDL_SCANCODE_T, SDL_SCANCODE_G, SDL_SCANCODE_F, SDL_SCANCODE_H, + SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L, + + // indirectly mapped keys SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, - SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L + SDL_SCANCODE_D, }; void Config::ReadValues() { @@ -58,6 +62,7 @@ void Config::ReadValues() { Settings::values.input_mappings[Settings::NativeInput::All[i]] = sdl2_config->GetInteger("Controls", Settings::NativeInput::Mapping[i], defaults[i]); } + Settings::values.pad_circle_modifier_scale = (float)sdl2_config->GetReal("Controls", "pad_circle_modifier_scale", 0.5); // Core Settings::values.frame_skip = sdl2_config->GetInteger("Core", "frame_skip", 0); |