diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-11-03 17:55:39 +0100 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-19 05:22:36 +0100 |
| commit | 3a6cd5b3c8dec11cc88c6aebdc4773233f615c91 (patch) | |
| tree | 980ef0304b375ddea0ef83c8786253e1a3548be7 /src/core/settings.h | |
| parent | qt: Move controller button config to separate dialog (diff) | |
| download | yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar.gz yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar.bz2 yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar.lz yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar.xz yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.tar.zst yuzu-3a6cd5b3c8dec11cc88c6aebdc4773233f615c91.zip | |
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; constexpr int NUM_BUTTONS_HID = BUTTON_HID_END - BUTTON_HID_BEGIN; constexpr int NUM_BUTTONS_NS = BUTTON_NS_END - BUTTON_NS_BEGIN; -static const std::array<const char*, NumButtons> mapping = {{ - "button_a", - "button_b", - "button_x", - "button_y", - "button_lstick", - "button_rstick", - "button_l", - "button_r", - "button_zl", - "button_zr", - "button_plus", - "button_minus", - "button_dleft", - "button_dup", - "button_dright", - "button_ddown", - "button_lstick_left", - "button_lstick_up", - "button_lstick_right", - "button_lstick_down", - "button_rstick_left", - "button_rstick_up", - "button_rstick_right", - "button_rstick_down", - "button_sl", - "button_sr", - "button_home", - "button_screenshot", -}}; +extern const std::array<const char*, NumButtons> mapping; } // namespace NativeButton @@ -105,10 +76,7 @@ constexpr int STICK_HID_BEGIN = LStick; constexpr int STICK_HID_END = NumAnalogs; constexpr int NUM_STICKS_HID = NumAnalogs; -static const std::array<const char*, NumAnalogs> mapping = {{ - "lstick", - "rstick", -}}; +extern const std::array<const char*, NumAnalogs> mapping; } // namespace NativeAnalog namespace NativeMouseButton { @@ -126,13 +94,7 @@ constexpr int MOUSE_HID_BEGIN = Left; constexpr int MOUSE_HID_END = NumMouseButtons; constexpr int NUM_MOUSE_HID = NumMouseButtons; -static const std::array<const char*, NumMouseButtons> mapping = {{ - "left", - "right", - "middle", - "forward", - "back", -}}; +extern const std::array<const char*, NumMouseButtons> mapping; } // namespace NativeMouseButton namespace NativeKeyboard { |