diff options
| author | bunnei <bunneidev@gmail.com> | 2015-02-24 03:13:29 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-24 03:13:29 +0100 |
| commit | 3700263f71d24b27fe1ff992985f45d7438069c1 (patch) | |
| tree | ccd9c0a8eef4cdcf7ec4d41cf861a49e46186d3d /src/citra | |
| parent | Merge pull request #581 from archshift/tfe (diff) | |
| parent | Frontends, HID: Add New 3DS specific pad buttons, and stub the touch one. (diff) | |
| download | yuzu-3700263f71d24b27fe1ff992985f45d7438069c1.tar yuzu-3700263f71d24b27fe1ff992985f45d7438069c1.tar.gz yuzu-3700263f71d24b27fe1ff992985f45d7438069c1.tar.bz2 yuzu-3700263f71d24b27fe1ff992985f45d7438069c1.tar.lz yuzu-3700263f71d24b27fe1ff992985f45d7438069c1.tar.xz yuzu-3700263f71d24b27fe1ff992985f45d7438069c1.tar.zst yuzu-3700263f71d24b27fe1ff992985f45d7438069c1.zip | |
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/config.cpp | 6 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 8 | ||||
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 10 |
3 files changed, 23 insertions, 1 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index f5b4069c7..e9f3dfd5b 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -44,6 +44,8 @@ void Config::ReadValues() { Settings::values.pad_y_key = glfw_config->GetInteger("Controls", "pad_y", GLFW_KEY_X); Settings::values.pad_l_key = glfw_config->GetInteger("Controls", "pad_l", GLFW_KEY_Q); Settings::values.pad_r_key = glfw_config->GetInteger("Controls", "pad_r", GLFW_KEY_W); + Settings::values.pad_zl_key = glfw_config->GetInteger("Controls", "pad_zl", GLFW_KEY_1); + Settings::values.pad_zr_key = glfw_config->GetInteger("Controls", "pad_zr", GLFW_KEY_2); Settings::values.pad_start_key = glfw_config->GetInteger("Controls", "pad_start", GLFW_KEY_M); Settings::values.pad_select_key = glfw_config->GetInteger("Controls", "pad_select", GLFW_KEY_N); Settings::values.pad_home_key = glfw_config->GetInteger("Controls", "pad_home", GLFW_KEY_B); @@ -55,6 +57,10 @@ void Config::ReadValues() { Settings::values.pad_sdown_key = glfw_config->GetInteger("Controls", "pad_sdown", GLFW_KEY_DOWN); Settings::values.pad_sleft_key = glfw_config->GetInteger("Controls", "pad_sleft", GLFW_KEY_LEFT); Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT); + Settings::values.pad_cup_key = glfw_config->GetInteger("Controls", "pad_cup", GLFW_KEY_I); + Settings::values.pad_cdown_key = glfw_config->GetInteger("Controls", "pad_cdown", GLFW_KEY_K); + Settings::values.pad_cleft_key = glfw_config->GetInteger("Controls", "pad_cleft", GLFW_KEY_J); + Settings::values.pad_cright_key = glfw_config->GetInteger("Controls", "pad_cright", GLFW_KEY_L); // Core Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 30); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index be4b289bd..798ff6e84 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -19,12 +19,18 @@ pad_a = pad_b = pad_x = pad_y = -pad_r = pad_l = +pad_r = +pad_zl = +pad_zr = pad_sup = pad_sdown = pad_sleft = pad_sright = +pad_cup = +pad_cdown = +pad_cleft = +pad_cright = [Core] gpu_refresh_rate = ## 30 (default) diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 8a3ee64a8..ec3e8cf34 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -139,6 +139,16 @@ void EmuWindow_GLFW::ReloadSetKeymaps() { KeyMap::SetKeyMapping({Settings::values.pad_l_key, keyboard_id}, Service::HID::PAD_L); KeyMap::SetKeyMapping({Settings::values.pad_x_key, keyboard_id}, Service::HID::PAD_X); KeyMap::SetKeyMapping({Settings::values.pad_y_key, keyboard_id}, Service::HID::PAD_Y); + + KeyMap::SetKeyMapping({Settings::values.pad_zl_key, keyboard_id}, Service::HID::PAD_ZL); + KeyMap::SetKeyMapping({Settings::values.pad_zr_key, keyboard_id}, Service::HID::PAD_ZR); + + // KeyMap::SetKeyMapping({Settings::values.pad_touch_key, keyboard_id}, Service::HID::PAD_TOUCH); + + KeyMap::SetKeyMapping({Settings::values.pad_cright_key, keyboard_id}, Service::HID::PAD_C_RIGHT); + KeyMap::SetKeyMapping({Settings::values.pad_cleft_key, keyboard_id}, Service::HID::PAD_C_LEFT); + KeyMap::SetKeyMapping({Settings::values.pad_cup_key, keyboard_id}, Service::HID::PAD_C_UP); + KeyMap::SetKeyMapping({Settings::values.pad_cdown_key, keyboard_id}, Service::HID::PAD_C_DOWN); KeyMap::SetKeyMapping({Settings::values.pad_sright_key, keyboard_id}, Service::HID::PAD_CIRCLE_RIGHT); KeyMap::SetKeyMapping({Settings::values.pad_sleft_key, keyboard_id}, Service::HID::PAD_CIRCLE_LEFT); KeyMap::SetKeyMapping({Settings::values.pad_sup_key, keyboard_id}, Service::HID::PAD_CIRCLE_UP); |