From d3b786d7250143e1460709d9b293f014e8519863 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 17 Feb 2025 21:58:27 +0100 Subject: [PATCH] init joyid here i hate the controller code --- src/sdl/i_system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 214d6c40d..931de4b8f 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -1253,8 +1253,6 @@ void I_GetJoystickEvents(UINT8 index) \param fname name of joystick \return axises - - */ static int joy_open(int playerIndex, int joyIndex) { @@ -1390,6 +1388,8 @@ void I_InitJoystick(UINT8 index) break; } + JoyInfo[index].id = I_GetJoystickDeviceIndex(JoyInfo[index].dev); + if (newcontroller && i < MAXSPLITSCREENPLAYERS) // don't override an active device { cv_usejoystick[index].value = JoyInfo[index].id + 1;