summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcpasjuste <cpasjuste@gmail.com>2020-04-24 13:29:55 +0200
committercpasjuste <cpasjuste@gmail.com>2020-04-24 13:29:55 +0200
commitfae5ba054cf9b82da218cfc4df7686f13d3107d3 (patch)
tree347159ce0b72e6b21cd14450418997cc496746ad
parentfb95def24c42392fe79b6ab672b5a6edc7210195 (diff)
downloadmv-fae5ba054cf9b82da218cfc4df7686f13d3107d3.tar.gz
mv-fae5ba054cf9b82da218cfc4df7686f13d3107d3.tar.bz2
mv-fae5ba054cf9b82da218cfc4df7686f13d3107d3.tar.xz
mv-fae5ba054cf9b82da218cfc4df7686f13d3107d3.zip
switch: add escape button (+)
switch: change default screen size
-rw-r--r--src/const/render/graphics.h5
-rw-r--r--src/input/inputactionmap.h20
2 files changed, 19 insertions, 6 deletions
diff --git a/src/const/render/graphics.h b/src/const/render/graphics.h
index c30c2fd57..3ce01edd5 100644
--- a/src/const/render/graphics.h
+++ b/src/const/render/graphics.h
@@ -25,7 +25,12 @@
#include "localconsts.h"
+#ifdef __SWITCH__
+static const int defaultScreenWidth = 1280;
+static const int defaultScreenHeight = 720;
+#else
static const int defaultScreenWidth = 800;
static const int defaultScreenHeight = 600;
+#endif
#endif // CONST_RENDER_GRAPHICS_H
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index ba8830130..9a7983312 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -351,11 +351,15 @@ static const InputActionData inputActionData
Protected_false},
{"keyQuit",
addKey(SDLK_ESCAPE),
-#if defined(USE_SDL2) && defined(ANDROID)
+#if defined(USE_SDL2)
+#if defined(ANDROID)
addKey(SDLK_AC_BACK),
-#else // defined(USE_SDL2) && defined(ANDROID)
+#elif defined(__SWITCH__)
+ joystickButton(10),
+#else
emptyKey,
-#endif // defined(USE_SDL2) && defined(ANDROID)
+#endif
+#endif // defined(USE_SDL2)
Input::GRP_DEFAULT,
&Actions::quit,
InputAction::NO_VALUE, 50,
@@ -2779,11 +2783,15 @@ static const InputActionData inputActionData
Protected_false},
{"keyGUICancel",
addKey(SDLK_ESCAPE),
-#if defined(USE_SDL2) && defined(ANDROID)
+#if defined(USE_SDL2)
+#if defined(ANDROID)
addKey(SDLK_AC_BACK),
-#else // defined(USE_SDL2) && defined(ANDROID)
+#elif defined(__SWITCH__)
+ joystickButton(10),
+#else
emptyKey,
-#endif // defined(USE_SDL2) && defined(ANDROID)
+#endif
+#endif // defined(USE_SDL2)
Input::GRP_GUICHAN,
nullptr,
InputAction::NO_VALUE, 50,