summaryrefslogtreecommitdiff
path: root/src/core/settings.h
diff options
context:
space:
mode:
authorGravatar Emmanuel Gil Peyrot2016-09-18 09:38:01 +0900
committerGravatar Emmanuel Gil Peyrot2016-09-18 09:38:01 +0900
commitdc8479928c5aee4c6ad6fe4f59006fb604cee701 (patch)
tree569a7f13128450bbab973236615587ff00bced5f /src/core/settings.h
parentTravis: Import Dolphin’s clang-format hook. (diff)
downloadyuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.gz
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.xz
yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.zip
Sources: Run clang-format on everything.
Diffstat (limited to 'src/core/settings.h')
-rw-r--r--src/core/settings.h51
1 files changed, 30 insertions, 21 deletions
diff --git a/src/core/settings.h b/src/core/settings.h
index fcd14c6f3..adb2fd538 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -4,8 +4,8 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <string>
8#include <array> 7#include <array>
8#include <string>
9 9
10#include "common/common_types.h" 10#include "common/common_types.h"
11 11
@@ -14,14 +14,31 @@ namespace Settings {
14namespace NativeInput { 14namespace NativeInput {
15enum Values { 15enum Values {
16 // directly mapped keys 16 // directly mapped keys
17 A, B, X, Y, 17 A,
18 L, R, ZL, ZR, 18 B,
19 START, SELECT, HOME, 19 X,
20 DUP, DDOWN, DLEFT, DRIGHT, 20 Y,
21 CUP, CDOWN, CLEFT, CRIGHT, 21 L,
22 R,
23 ZL,
24 ZR,
25 START,
26 SELECT,
27 HOME,
28 DUP,
29 DDOWN,
30 DLEFT,
31 DRIGHT,
32 CUP,
33 CDOWN,
34 CLEFT,
35 CRIGHT,
22 36
23 // indirectly mapped keys 37 // indirectly mapped keys
24 CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, 38 CIRCLE_UP,
39 CIRCLE_DOWN,
40 CIRCLE_LEFT,
41 CIRCLE_RIGHT,
25 CIRCLE_MODIFIER, 42 CIRCLE_MODIFIER,
26 43
27 NUM_INPUTS 44 NUM_INPUTS
@@ -29,28 +46,21 @@ enum Values {
29 46
30static const std::array<const char*, NUM_INPUTS> Mapping = {{ 47static const std::array<const char*, NUM_INPUTS> Mapping = {{
31 // directly mapped keys 48 // directly mapped keys
32 "pad_a", "pad_b", "pad_x", "pad_y", 49 "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", 50 "pad_select", "pad_home", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_cup",
34 "pad_start", "pad_select", "pad_home", 51 "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 52
38 // indirectly mapped keys 53 // indirectly mapped keys
39 "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right", 54 "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right",
40 "pad_circle_modifier", 55 "pad_circle_modifier",
41}}; 56}};
42static const std::array<Values, NUM_INPUTS> All = {{ 57static const std::array<Values, NUM_INPUTS> All = {{
43 A, B, X, Y, 58 A, B, X, Y, L, R, ZL, ZR,
44 L, R, ZL, ZR, 59 START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, CUP,
45 START, SELECT, HOME, 60 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}}; 61}};
51} 62}
52 63
53
54struct Values { 64struct Values {
55 // CheckNew3DS 65 // CheckNew3DS
56 bool is_new_3ds; 66 bool is_new_3ds;
@@ -91,5 +101,4 @@ struct Values {
91} extern values; 101} extern values;
92 102
93void Apply(); 103void Apply();
94
95} 104}