From 30071e8f645556285c3ed277eeb2eab15f2d9d73 Mon Sep 17 00:00:00 2001 From: Catherine Reprobate Date: Sun, 13 Apr 2025 10:35:43 -0700 Subject: [PATCH 1/2] port: call `joyReset()` when changing controllers This needs to be called for controller reassignments to take effect in MP modes --- port/src/optionsmenu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/port/src/optionsmenu.c b/port/src/optionsmenu.c index 4771fc28b..29105ab93 100644 --- a/port/src/optionsmenu.c +++ b/port/src/optionsmenu.c @@ -597,8 +597,10 @@ static MenuItemHandlerResult menuhandlerController(s32 operation, struct menuite if (data->dropdown.value == 0) { // unassign controller inputAssignController(g_ExtMenuPlayer, -1); + joyReset(); } else if (data->dropdown.value <= numCtrls) { inputAssignController(g_ExtMenuPlayer, ctrls[data->dropdown.value - 1]); + joyReset(); } break; case MENUOP_GETSELECTEDINDEX: From ab73fdcc308407cc3cb4e1608fcc6a35e5649863 Mon Sep 17 00:00:00 2001 From: Catherine Reprobate Date: Sun, 13 Apr 2025 10:44:26 -0700 Subject: [PATCH 2/2] fixup: include header for `joyReset` --- port/src/optionsmenu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/port/src/optionsmenu.c b/port/src/optionsmenu.c index 29105ab93..e077acb31 100644 --- a/port/src/optionsmenu.c +++ b/port/src/optionsmenu.c @@ -10,6 +10,7 @@ #include "game/menu.h" #include "game/gamefile.h" #include "game/player.h" +#include "lib/joy.h" #include "video.h" #include "input.h" #include "config.h"