diff options
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) { | |||
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = { | 46 | static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = { |
| 47 | // directly mapped keys | ||
| 47 | SDL_SCANCODE_A, SDL_SCANCODE_S, SDL_SCANCODE_Z, SDL_SCANCODE_X, | 48 | SDL_SCANCODE_A, SDL_SCANCODE_S, SDL_SCANCODE_Z, SDL_SCANCODE_X, |
| 48 | SDL_SCANCODE_Q, SDL_SCANCODE_W, SDL_SCANCODE_1, SDL_SCANCODE_2, | 49 | SDL_SCANCODE_Q, SDL_SCANCODE_W, SDL_SCANCODE_1, SDL_SCANCODE_2, |
| 49 | SDL_SCANCODE_M, SDL_SCANCODE_N, SDL_SCANCODE_B, | 50 | SDL_SCANCODE_M, SDL_SCANCODE_N, SDL_SCANCODE_B, |
| 50 | SDL_SCANCODE_T, SDL_SCANCODE_G, SDL_SCANCODE_F, SDL_SCANCODE_H, | 51 | SDL_SCANCODE_T, SDL_SCANCODE_G, SDL_SCANCODE_F, SDL_SCANCODE_H, |
| 52 | SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L, | ||
| 53 | |||
| 54 | // indirectly mapped keys | ||
| 51 | 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, |
| 52 | SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L | 56 | SDL_SCANCODE_D, |
| 53 | }; | 57 | }; |
| 54 | 58 | ||
| 55 | void Config::ReadValues() { | 59 | void Config::ReadValues() { |
| @@ -58,6 +62,7 @@ void Config::ReadValues() { | |||
| 58 | Settings::values.input_mappings[Settings::NativeInput::All[i]] = | 62 | Settings::values.input_mappings[Settings::NativeInput::All[i]] = |
| 59 | sdl2_config->GetInteger("Controls", Settings::NativeInput::Mapping[i], defaults[i]); | 63 | sdl2_config->GetInteger("Controls", Settings::NativeInput::Mapping[i], defaults[i]); |
| 60 | } | 64 | } |
| 65 | Settings::values.pad_circle_modifier_scale = (float)sdl2_config->GetReal("Controls", "pad_circle_modifier_scale", 0.5); | ||
| 61 | 66 | ||
| 62 | // Core | 67 | // Core |
| 63 | Settings::values.frame_skip = sdl2_config->GetInteger("Core", "frame_skip", 0); | 68 | Settings::values.frame_skip = sdl2_config->GetInteger("Core", "frame_skip", 0); |