commit 203f5da3f9bfd38b5db7d9e2b501748ac550b602
Author:     Michael Day <contact@michaelcday.com>
AuthorDate: Mon Aug 21 14:59:53 2023 -0400
Commit:     Turo Lamminen <turol@users.noreply.github.com>
CommitDate: Wed Aug 23 11:42:50 2023 +0300

    joystick: SDL_Init -> SDL_InitSubSystem
---
 src/i_joystick.c          | 4 ++--
 src/setup/joystick.c      | 2 +-
 src/setup/txt_joyaxis.c   | 2 +-
 src/setup/txt_joybinput.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i_joystick.c b/src/i_joystick.c
index 97aee817..abf2177c 100644
--- a/src/i_joystick.c
+++ b/src/i_joystick.c
@@ -175,7 +175,7 @@ void I_InitGamepad(void)
         return;
     }

-    if (SDL_Init(SDL_INIT_GAMECONTROLLER) < 0)
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0)
     {
         return;
     }
@@ -410,7 +410,7 @@ void I_InitJoystick(void)
         return;
     }

-    if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
     {
         return;
     }
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index dc687182..25bb0bdd 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -770,7 +770,7 @@ static void InitJoystick(void)
 {
     if (!joystick_initted)
     {
-        joystick_initted = SDL_Init(SDL_INIT_JOYSTICK) >= 0;
+        joystick_initted = SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0;
     }
 }

diff --git a/src/setup/txt_joyaxis.c b/src/setup/txt_joyaxis.c
index 87de88f8..620c0bfa 100644
--- a/src/setup/txt_joyaxis.c
+++ b/src/setup/txt_joyaxis.c
@@ -359,7 +359,7 @@ void TXT_ConfigureJoystickAxis(txt_joystick_axis_t *joystick_axis,
                                txt_joystick_axis_callback_t callback)
 {
     // Open the joystick first.
-    if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
     {
         return;
     }
diff --git a/src/setup/txt_joybinput.c b/src/setup/txt_joybinput.c
index 6321a066..0cb651ac 100644
--- a/src/setup/txt_joybinput.c
+++ b/src/setup/txt_joybinput.c
@@ -467,7 +467,7 @@ static void OpenPromptWindow(txt_joystick_input_t *joystick_input)

     joystick_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);

-    if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
     {
         return;
     }
@@ -502,7 +502,7 @@ static void OpenPromptWindowGamepad(txt_joystick_input_t *joystick_input)

     joystick_input->check_conflicts = !TXT_GetModifierState(TXT_MOD_SHIFT);

-    if (SDL_Init(SDL_INIT_GAMECONTROLLER) < 0)
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0)
     {
         return;
     }