diff options
| author |  Zach Hilman | 2018-11-03 12:55:39 -0400 |
|---|---|---|
| committer | Zach Hilman | 2018-11-18 23:22:36 -0500 |
| commit | 3a6cd5b3c8dec11cc88c6aebdc4773233f615c91 (patch) | |
| tree | 980ef0304b375ddea0ef83c8786253e1a3548be7 /src/core/settings.h | |
| parent | qt: Move controller button config to separate dialog (diff) | |
| download | yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar.gz yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar.xz yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.zip | |
hid: Use player-defined controller type as PREFERRED_CONTROLLER
Diffstat (limited to 'src/core/settings.h')
| -rw-r--r-- | src/core/settings.h | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 9cc3c1dc8..e63134f80 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -60,36 +60,7 @@ constexpr int BUTTON_NS_END = NumButtons; | |||
| 60 | constexpr int NUM_BUTTONS_HID = BUTTON_HID_END - BUTTON_HID_BEGIN; | 60 | constexpr int NUM_BUTTONS_HID = BUTTON_HID_END - BUTTON_HID_BEGIN; |
| 61 | constexpr int NUM_BUTTONS_NS = BUTTON_NS_END - BUTTON_NS_BEGIN; | 61 | constexpr int NUM_BUTTONS_NS = BUTTON_NS_END - BUTTON_NS_BEGIN; |
| 62 | 62 | ||
| 63 | static const std::array<const char*, NumButtons> mapping = {{ | 63 | extern const std::array<const char*, NumButtons> mapping; |
| 64 | "button_a", | ||
| 65 | "button_b", | ||
| 66 | "button_x", | ||
| 67 | "button_y", | ||
| 68 | "button_lstick", | ||
| 69 | "button_rstick", | ||
| 70 | "button_l", | ||
| 71 | "button_r", | ||
| 72 | "button_zl", | ||
| 73 | "button_zr", | ||
| 74 | "button_plus", | ||
| 75 | "button_minus", | ||
| 76 | "button_dleft", | ||
| 77 | "button_dup", | ||
| 78 | "button_dright", | ||
| 79 | "button_ddown", | ||
| 80 | "button_lstick_left", | ||
| 81 | "button_lstick_up", | ||
| 82 | "button_lstick_right", | ||
| 83 | "button_lstick_down", | ||
| 84 | "button_rstick_left", | ||
| 85 | "button_rstick_up", | ||
| 86 | "button_rstick_right", | ||
| 87 | "button_rstick_down", | ||
| 88 | "button_sl", | ||
| 89 | "button_sr", | ||
| 90 | "button_home", | ||
| 91 | "button_screenshot", | ||
| 92 | }}; | ||
| 93 | 64 | ||
| 94 | } // namespace NativeButton | 65 | } // namespace NativeButton |
| 95 | 66 | ||
| @@ -105,10 +76,7 @@ constexpr int STICK_HID_BEGIN = LStick; | |||
| 105 | constexpr int STICK_HID_END = NumAnalogs; | 76 | constexpr int STICK_HID_END = NumAnalogs; |
| 106 | constexpr int NUM_STICKS_HID = NumAnalogs; | 77 | constexpr int NUM_STICKS_HID = NumAnalogs; |
| 107 | 78 | ||
| 108 | static const std::array<const char*, NumAnalogs> mapping = {{ | 79 | extern const std::array<const char*, NumAnalogs> mapping; |
| 109 | "lstick", | ||
| 110 | "rstick", | ||
| 111 | }}; | ||
| 112 | } // namespace NativeAnalog | 80 | } // namespace NativeAnalog |
| 113 | 81 | ||
| 114 | namespace NativeMouseButton { | 82 | namespace NativeMouseButton { |
| @@ -126,13 +94,7 @@ constexpr int MOUSE_HID_BEGIN = Left; | |||
| 126 | constexpr int MOUSE_HID_END = NumMouseButtons; | 94 | constexpr int MOUSE_HID_END = NumMouseButtons; |
| 127 | constexpr int NUM_MOUSE_HID = NumMouseButtons; | 95 | constexpr int NUM_MOUSE_HID = NumMouseButtons; |
| 128 | 96 | ||
| 129 | static const std::array<const char*, NumMouseButtons> mapping = {{ | 97 | extern const std::array<const char*, NumMouseButtons> mapping; |
| 130 | "left", | ||
| 131 | "right", | ||
| 132 | "middle", | ||
| 133 | "forward", | ||
| 134 | "back", | ||
| 135 | }}; | ||
| 136 | } // namespace NativeMouseButton | 98 | } // namespace NativeMouseButton |
| 137 | 99 | ||
| 138 | namespace NativeKeyboard { | 100 | namespace NativeKeyboard { |