diff options
author | wwylele <wwylele@gmail.com> | 2016-05-12 12:09:36 +0200 |
---|---|---|
committer | wwylele <wwylele@gmail.com> | 2016-05-15 12:24:22 +0200 |
commit | 03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9 (patch) | |
tree | 95edc62b3b8520a533e534bf4991159875fef3e5 /src/core/settings.h | |
parent | AudioCore: Implement time stretcher (#1737) (diff) | |
download | yuzu-03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9.tar yuzu-03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9.tar.gz yuzu-03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9.tar.bz2 yuzu-03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9.tar.lz yuzu-03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9.tar.xz yuzu-03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9.tar.zst yuzu-03631f9b8fe75cf1c3a70a3094aeddcebffa4cf9.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/settings.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index ce2a31164..df5915442 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -13,29 +13,37 @@ namespace Settings { namespace NativeInput { enum Values { + // directly mapped keys A, B, X, Y, L, R, ZL, ZR, START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, - SUP, SDOWN, SLEFT, SRIGHT, CUP, CDOWN, CLEFT, CRIGHT, + + // indirectly mapped keys + CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, + NUM_INPUTS }; + static const std::array<const char*, NUM_INPUTS> Mapping = {{ + // directly mapped keys "pad_a", "pad_b", "pad_x", "pad_y", "pad_l", "pad_r", "pad_zl", "pad_zr", "pad_start", "pad_select", "pad_home", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", - "pad_sup", "pad_sdown", "pad_sleft", "pad_sright", - "pad_cup", "pad_cdown", "pad_cleft", "pad_cright" + "pad_cup", "pad_cdown", "pad_cleft", "pad_cright", + + // indirectly mapped keys + "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right" }}; static const std::array<Values, NUM_INPUTS> All = {{ A, B, X, Y, L, R, ZL, ZR, START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, - SUP, SDOWN, SLEFT, SRIGHT, - CUP, CDOWN, CLEFT, CRIGHT + CUP, CDOWN, CLEFT, CRIGHT, + CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, }}; } |