diff options
| author | wwylele <wwylele@gmail.com> | 2016-05-13 17:32:43 +0200 |
|---|---|---|
| committer | wwylele <wwylele@gmail.com> | 2016-05-15 12:24:22 +0200 |
| commit | 416faa20d1156ac4e8646710e9c1f9565c0ed14b (patch) | |
| tree | 8bc07be0343eea7f028c9a6ba52fee55d5ba0f1f /src/core | |
| parent | Refactor input subsystem (diff) | |
| download | yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar.gz yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar.bz2 yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar.lz yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar.xz yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.tar.zst yuzu-416faa20d1156ac4e8646710e9c1f9565c0ed14b.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/settings.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index df5915442..d6f8f2ff3 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -22,6 +22,7 @@ enum Values { // indirectly mapped keys CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, + CIRCLE_MODIFIER, NUM_INPUTS }; @@ -35,7 +36,8 @@ static const std::array<const char*, NUM_INPUTS> Mapping = {{ "pad_cup", "pad_cdown", "pad_cleft", "pad_cright", // indirectly mapped keys - "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right" + "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right", + "pad_circle_modifier", }}; static const std::array<Values, NUM_INPUTS> All = {{ A, B, X, Y, @@ -44,6 +46,7 @@ static const std::array<Values, NUM_INPUTS> All = {{ DUP, DDOWN, DLEFT, DRIGHT, CUP, CDOWN, CLEFT, CRIGHT, CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, + CIRCLE_MODIFIER, }}; } @@ -51,6 +54,7 @@ static const std::array<Values, NUM_INPUTS> All = {{ struct Values { // Controls std::array<int, NativeInput::NUM_INPUTS> input_mappings; + float pad_circle_modifier_scale; // Core int frame_skip; |