diff options
| author | 2020-08-27 14:58:44 -0400 | |
|---|---|---|
| committer | 2020-08-27 14:58:44 -0400 | |
| commit | 3db9a259771a44278ff34168ba140c2c7815a1cf (patch) | |
| tree | e341942ba33f882468837d763004ae7de5fe0053 /src/core/settings.cpp | |
| parent | Merge pull request #4577 from lioncash/asserts (diff) | |
| parent | input_common/main: Add "/Mouse" to the display name (diff) | |
| download | yuzu-3db9a259771a44278ff34168ba140c2c7815a1cf.tar.gz yuzu-3db9a259771a44278ff34168ba140c2c7815a1cf.tar.xz yuzu-3db9a259771a44278ff34168ba140c2c7815a1cf.zip | |
Merge pull request #4530 from Morph1984/mjolnir-p1
Project Mjölnir: Part 1 - Input Rewrite
Diffstat (limited to 'src/core/settings.cpp')
| -rw-r--r-- | src/core/settings.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index d328fb8b7..28d3f9099 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -13,56 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | namespace Settings { | 14 | namespace Settings { |
| 15 | 15 | ||
| 16 | namespace NativeButton { | ||
| 17 | const std::array<const char*, NumButtons> mapping = {{ | ||
| 18 | "button_a", | ||
| 19 | "button_b", | ||
| 20 | "button_x", | ||
| 21 | "button_y", | ||
| 22 | "button_lstick", | ||
| 23 | "button_rstick", | ||
| 24 | "button_l", | ||
| 25 | "button_r", | ||
| 26 | "button_zl", | ||
| 27 | "button_zr", | ||
| 28 | "button_plus", | ||
| 29 | "button_minus", | ||
| 30 | "button_dleft", | ||
| 31 | "button_dup", | ||
| 32 | "button_dright", | ||
| 33 | "button_ddown", | ||
| 34 | "button_lstick_left", | ||
| 35 | "button_lstick_up", | ||
| 36 | "button_lstick_right", | ||
| 37 | "button_lstick_down", | ||
| 38 | "button_rstick_left", | ||
| 39 | "button_rstick_up", | ||
| 40 | "button_rstick_right", | ||
| 41 | "button_rstick_down", | ||
| 42 | "button_sl", | ||
| 43 | "button_sr", | ||
| 44 | "button_home", | ||
| 45 | "button_screenshot", | ||
| 46 | }}; | ||
| 47 | } | ||
| 48 | |||
| 49 | namespace NativeAnalog { | ||
| 50 | const std::array<const char*, NumAnalogs> mapping = {{ | ||
| 51 | "lstick", | ||
| 52 | "rstick", | ||
| 53 | }}; | ||
| 54 | } | ||
| 55 | |||
| 56 | namespace NativeMouseButton { | ||
| 57 | const std::array<const char*, NumMouseButtons> mapping = {{ | ||
| 58 | "left", | ||
| 59 | "right", | ||
| 60 | "middle", | ||
| 61 | "forward", | ||
| 62 | "back", | ||
| 63 | }}; | ||
| 64 | } | ||
| 65 | |||
| 66 | Values values = {}; | 16 | Values values = {}; |
| 67 | bool configuring_global = true; | 17 | bool configuring_global = true; |
| 68 | 18 | ||