encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switch: let the user handle single/dual joycons mode (#14)

This commit is contained in:
Cpasjuste 2018-05-15 14:38:37 +02:00 committed by Dave Murphy
parent 2e41af5305
commit 137217702f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/joystick/switch/SDL_sysjoystick.c
View File

@ -43,7 +43,7 @@ typedef struct JoystickState
static JoystickState pad[JOYSTICK_COUNT]; static JoystickState pad[JOYSTICK_COUNT];
static HidControllerID pad_id[JOYSTICK_COUNT] = { static HidControllerID pad_id[JOYSTICK_COUNT] = {
CONTROLLER_PLAYER_1, CONTROLLER_PLAYER_2, CONTROLLER_HANDHELD, CONTROLLER_PLAYER_2,
CONTROLLER_PLAYER_3, CONTROLLER_PLAYER_4, CONTROLLER_PLAYER_3, CONTROLLER_PLAYER_4,
CONTROLLER_PLAYER_5, CONTROLLER_PLAYER_6, CONTROLLER_PLAYER_5, CONTROLLER_PLAYER_6,
CONTROLLER_PLAYER_7, CONTROLLER_PLAYER_8 CONTROLLER_PLAYER_7, CONTROLLER_PLAYER_8
@ -68,7 +68,6 @@ SDL_SYS_JoystickInit(void)
{ {
for (int i = 0; i < JOYSTICK_COUNT; i++) { for (int i = 0; i < JOYSTICK_COUNT; i++) {
pad[i].id = pad_id[i]; pad[i].id = pad_id[i];
hidSetNpadJoyAssignmentModeSingleByDefault(pad[i].id);
} }
return JOYSTICK_COUNT; return JOYSTICK_COUNT;
@ -83,8 +82,6 @@ SDL_SYS_NumJoysticks(void)
void void
SDL_SYS_JoystickDetect(void) SDL_SYS_JoystickDetect(void)
{ {
pad[0].id = hidGetHandheldMode() ?
CONTROLLER_HANDHELD : CONTROLLER_PLAYER_1;
} }
/* Function to get the device-dependent name of a joystick */ /* Function to get the device-dependent name of a joystick */
@ -206,6 +203,6 @@ SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick *joystick)
return guid; return guid;
} }
#endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */ #endif /* SDL_JOYSTICK_SWITCH */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */