summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/settings.h6
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 {
22 22
23 // indirectly mapped keys 23 // indirectly mapped keys
24 CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, 24 CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
25 CIRCLE_MODIFIER,
25 26
26 NUM_INPUTS 27 NUM_INPUTS
27}; 28};
@@ -35,7 +36,8 @@ static const std::array<const char*, NUM_INPUTS> Mapping = {{
35 "pad_cup", "pad_cdown", "pad_cleft", "pad_cright", 36 "pad_cup", "pad_cdown", "pad_cleft", "pad_cright",
36 37
37 // indirectly mapped keys 38 // indirectly mapped keys
38 "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right" 39 "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right",
40 "pad_circle_modifier",
39}}; 41}};
40static const std::array<Values, NUM_INPUTS> All = {{ 42static const std::array<Values, NUM_INPUTS> All = {{
41 A, B, X, Y, 43 A, B, X, Y,
@@ -44,6 +46,7 @@ static const std::array<Values, NUM_INPUTS> All = {{
44 DUP, DDOWN, DLEFT, DRIGHT, 46 DUP, DDOWN, DLEFT, DRIGHT,
45 CUP, CDOWN, CLEFT, CRIGHT, 47 CUP, CDOWN, CLEFT, CRIGHT,
46 CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, 48 CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
49 CIRCLE_MODIFIER,
47}}; 50}};
48} 51}
49 52
@@ -51,6 +54,7 @@ static const std::array<Values, NUM_INPUTS> All = {{
51struct Values { 54struct Values {
52 // Controls 55 // Controls
53 std::array<int, NativeInput::NUM_INPUTS> input_mappings; 56 std::array<int, NativeInput::NUM_INPUTS> input_mappings;
57 float pad_circle_modifier_scale;
54 58
55 // Core 59 // Core
56 int frame_skip; 60 int frame_skip;