diff options
Diffstat (limited to 'src/core/settings.h')
| -rw-r--r-- | src/core/settings.h | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index fcd14c6f3..5a64f8018 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -4,9 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <string> | ||
| 8 | #include <array> | 7 | #include <array> |
| 9 | 8 | #include <string> | |
| 10 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 11 | 10 | ||
| 12 | namespace Settings { | 11 | namespace Settings { |
| @@ -14,14 +13,31 @@ namespace Settings { | |||
| 14 | namespace NativeInput { | 13 | namespace NativeInput { |
| 15 | enum Values { | 14 | enum Values { |
| 16 | // directly mapped keys | 15 | // directly mapped keys |
| 17 | A, B, X, Y, | 16 | A, |
| 18 | L, R, ZL, ZR, | 17 | B, |
| 19 | START, SELECT, HOME, | 18 | X, |
| 20 | DUP, DDOWN, DLEFT, DRIGHT, | 19 | Y, |
| 21 | CUP, CDOWN, CLEFT, CRIGHT, | 20 | L, |
| 21 | R, | ||
| 22 | ZL, | ||
| 23 | ZR, | ||
| 24 | START, | ||
| 25 | SELECT, | ||
| 26 | HOME, | ||
| 27 | DUP, | ||
| 28 | DDOWN, | ||
| 29 | DLEFT, | ||
| 30 | DRIGHT, | ||
| 31 | CUP, | ||
| 32 | CDOWN, | ||
| 33 | CLEFT, | ||
| 34 | CRIGHT, | ||
| 22 | 35 | ||
| 23 | // indirectly mapped keys | 36 | // indirectly mapped keys |
| 24 | CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, | 37 | CIRCLE_UP, |
| 38 | CIRCLE_DOWN, | ||
| 39 | CIRCLE_LEFT, | ||
| 40 | CIRCLE_RIGHT, | ||
| 25 | CIRCLE_MODIFIER, | 41 | CIRCLE_MODIFIER, |
| 26 | 42 | ||
| 27 | NUM_INPUTS | 43 | NUM_INPUTS |
| @@ -29,28 +45,21 @@ enum Values { | |||
| 29 | 45 | ||
| 30 | static const std::array<const char*, NUM_INPUTS> Mapping = {{ | 46 | static const std::array<const char*, NUM_INPUTS> Mapping = {{ |
| 31 | // directly mapped keys | 47 | // directly mapped keys |
| 32 | "pad_a", "pad_b", "pad_x", "pad_y", | 48 | "pad_a", "pad_b", "pad_x", "pad_y", "pad_l", "pad_r", "pad_zl", "pad_zr", "pad_start", |
| 33 | "pad_l", "pad_r", "pad_zl", "pad_zr", | 49 | "pad_select", "pad_home", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_cup", |
| 34 | "pad_start", "pad_select", "pad_home", | 50 | "pad_cdown", "pad_cleft", "pad_cright", |
| 35 | "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", | ||
| 36 | "pad_cup", "pad_cdown", "pad_cleft", "pad_cright", | ||
| 37 | 51 | ||
| 38 | // indirectly mapped keys | 52 | // indirectly mapped keys |
| 39 | "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right", | 53 | "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right", |
| 40 | "pad_circle_modifier", | 54 | "pad_circle_modifier", |
| 41 | }}; | 55 | }}; |
| 42 | static const std::array<Values, NUM_INPUTS> All = {{ | 56 | static const std::array<Values, NUM_INPUTS> All = {{ |
| 43 | A, B, X, Y, | 57 | A, B, X, Y, L, R, ZL, ZR, |
| 44 | L, R, ZL, ZR, | 58 | START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, CUP, |
| 45 | START, SELECT, HOME, | 59 | CDOWN, CLEFT, CRIGHT, CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, CIRCLE_MODIFIER, |
| 46 | DUP, DDOWN, DLEFT, DRIGHT, | ||
| 47 | CUP, CDOWN, CLEFT, CRIGHT, | ||
| 48 | CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, | ||
| 49 | CIRCLE_MODIFIER, | ||
| 50 | }}; | 60 | }}; |
| 51 | } | 61 | } |
| 52 | 62 | ||
| 53 | |||
| 54 | struct Values { | 63 | struct Values { |
| 55 | // CheckNew3DS | 64 | // CheckNew3DS |
| 56 | bool is_new_3ds; | 65 | bool is_new_3ds; |
| @@ -91,5 +100,4 @@ struct Values { | |||
| 91 | } extern values; | 100 | } extern values; |
| 92 | 101 | ||
| 93 | void Apply(); | 102 | void Apply(); |
| 94 | |||
| 95 | } | 103 | } |