summaryrefslogtreecommitdiffstats
path: root/src/citra/emu_window
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-02-22 00:50:16 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-02-22 21:09:08 +0100
commitaa64f69af019d6a30e812593eaa70ba9c90dd865 (patch)
treef6de223fb79ddf3563d4c7f5a5e126f59f61835c /src/citra/emu_window
parentMerge pull request #590 from linkmauve/rename-dolphin (diff)
downloadyuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.gz
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.bz2
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.lz
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.xz
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.tar.zst
yuzu-aa64f69af019d6a30e812593eaa70ba9c90dd865.zip
Diffstat (limited to '')
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp10
1 files changed, 10 insertions, 0 deletions
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);