diff options
| author | 2018-01-20 19:12:21 -0500 | |
|---|---|---|
| committer | 2018-01-20 19:12:21 -0500 | |
| commit | 557b2496d7a83b26ad6737543a7da91826650fca (patch) | |
| tree | 28c5d2fa3cba08f1f49f5c10fa16bfb94144d01c /src/yuzu_cmd/config.cpp | |
| parent | Merge pull request #120 from Rozelette/master (diff) | |
| parent | Travis: Add missing PPA for newer libstdc++ (diff) | |
| download | yuzu-557b2496d7a83b26ad6737543a7da91826650fca.tar.gz yuzu-557b2496d7a83b26ad6737543a7da91826650fca.tar.xz yuzu-557b2496d7a83b26ad6737543a7da91826650fca.zip | |
Merge pull request #117 from jroweboy/clang-format
Clang format as a build target
Diffstat (limited to 'src/yuzu_cmd/config.cpp')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index e5be72213..bf79d2e81 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -49,10 +49,18 @@ static const std::array<int, Settings::NativeButton::NumButtons> default_buttons | |||
| 49 | 49 | ||
| 50 | static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs{{ | 50 | static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs{{ |
| 51 | { | 51 | { |
| 52 | SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, SDL_SCANCODE_D, | 52 | SDL_SCANCODE_UP, |
| 53 | SDL_SCANCODE_DOWN, | ||
| 54 | SDL_SCANCODE_LEFT, | ||
| 55 | SDL_SCANCODE_RIGHT, | ||
| 56 | SDL_SCANCODE_D, | ||
| 53 | }, | 57 | }, |
| 54 | { | 58 | { |
| 55 | SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L, SDL_SCANCODE_D, | 59 | SDL_SCANCODE_I, |
| 60 | SDL_SCANCODE_K, | ||
| 61 | SDL_SCANCODE_J, | ||
| 62 | SDL_SCANCODE_L, | ||
| 63 | SDL_SCANCODE_D, | ||
| 56 | }, | 64 | }, |
| 57 | }}; | 65 | }}; |
| 58 | 66 | ||