Jayden/yuzu
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sources: Run clang-format on everything.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot
2016-09-18 09:38:01 +09:00
parent 1f7bfe040c
commit 7e8d205414
386 changed files with 19560 additions and 18080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/settings.h
+30 -21
View File
@@ -4,8 +4,8 @@
#pragma once
#include <string>
#include <array>
#include <string>
#include "common/common_types.h"
@@ -14,14 +14,31 @@ namespace Settings {
namespace NativeInput {
enum Values {
// directly mapped keys
A, B, X, Y,
L, R, ZL, ZR,
START, SELECT, HOME,
DUP, DDOWN, DLEFT, DRIGHT,
CUP, CDOWN, CLEFT, CRIGHT,
A,
B,
X,
Y,
L,
R,
ZL,
ZR,
START,
SELECT,
HOME,
DUP,
DDOWN,
DLEFT,
DRIGHT,
CUP,
CDOWN,
CLEFT,
CRIGHT,
// indirectly mapped keys
CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
CIRCLE_UP,
CIRCLE_DOWN,
CIRCLE_LEFT,
CIRCLE_RIGHT,
CIRCLE_MODIFIER,
NUM_INPUTS
@@ -29,28 +46,21 @@ enum Values {
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_cup", "pad_cdown", "pad_cleft", "pad_cright",
"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_cup",
"pad_cdown", "pad_cleft", "pad_cright",
// indirectly mapped keys
"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,
L, R, ZL, ZR,
START, SELECT, HOME,
DUP, DDOWN, DLEFT, DRIGHT,
CUP, CDOWN, CLEFT, CRIGHT,
CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
CIRCLE_MODIFIER,
A, B, X, Y, L, R, ZL, ZR,
START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, CUP,
CDOWN, CLEFT, CRIGHT, CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, CIRCLE_MODIFIER,
}};
}
struct Values {
// CheckNew3DS
bool is_new_3ds;
@@ -91,5 +101,4 @@ struct Values {
} extern values;
void Apply();
}