Turn with the left stick X axis if there is only one stick

Author: lazd

id_in.cpp

@@ -59,6 +59,7 @@ static KeyboardDef KbdDefs = {
 static SDL_Joystick *Joystick;
 static SDL_GameController *GameController;
 int JoyNumButtons;
+int JoyNumAxes;
 static int JoyNumHats;
 
 static bool GrabInput = false;
@@ -434,6 +435,7 @@ IN_Startup(void)
 
         if(Joystick)
         {
+            JoyNumAxes = SDL_JoystickNumAxes(Joystick);
             JoyNumButtons = SDL_JoystickNumButtons(Joystick);
             if(JoyNumButtons > 32) JoyNumButtons = 32;      // only up to 32 buttons are supported
             JoyNumHats = SDL_JoystickNumHats(Joystick);

id_in.h

@@ -142,6 +142,7 @@ extern  volatile boolean    Paused;
 extern  volatile char       LastASCII;
 extern  /*volatile*/ ScanCode   LastScan;
 extern           int        JoyNumButtons;
+extern           int        JoyNumAxes;
 extern           boolean    forcegrabmouse;
 
 

wl_agent.cpp

@@ -174,12 +174,15 @@ void ControlMovement (objtype *ob)
 
     int joyx, joyy;
     float joyfactor = 1;
-    if (joystickenabled) {
+    bool joystrafe = false;
+    if (joystickenabled && JoyNumAxes >= 4) {
+        // Enable strafing with the left stick if we have two sticks
+        joystrafe = true;
         IN_GetJoyDelta (&joyx, &joyy, SDL_CONTROLLER_AXIS_LEFTX, SDL_CONTROLLER_AXIS_RIGHTY);
         joyfactor = abs(joyx) / 127.0;
     }
 
-    if(buttonstate[bt_strafeleft] || (joystickenabled && joyx < -JOYDEADZONE))
+    if(buttonstate[bt_strafeleft] || (joystrafe && joyx < -JOYDEADZONE))
     {
         angle = ob->angle + ANGLES/4;
         if(angle >= ANGLES)
@@ -190,7 +193,7 @@ void ControlMovement (objtype *ob)
             Thrust(angle, (int32_t) (joyfactor * BASEMOVE * MOVESCALE * tics));
     }
 
-    if(buttonstate[bt_straferight] || (joystickenabled && joyx > JOYDEADZONE))
+    if(buttonstate[bt_straferight] || (joystrafe && joyx > JOYDEADZONE))
     {
         angle = ob->angle - ANGLES/4;
         if(angle < 0)

wl_play.cpp

@@ -364,7 +364,8 @@ void PollJoystickMove (void)
 {
     int joyx, joyy;
 
-    IN_GetJoyDelta (&joyx, &joyy, SDL_CONTROLLER_AXIS_RIGHTX, SDL_CONTROLLER_AXIS_LEFTY);
+    // Turn with the left stick X axis if there is only one stick
+    IN_GetJoyDelta (&joyx, &joyy, JoyNumAxes >= 4 ? SDL_CONTROLLER_AXIS_RIGHTX : SDL_CONTROLLER_AXIS_LEFTX, SDL_CONTROLLER_AXIS_LEFTY);
 
     int delta = buttonstate[bt_run] ? RUNMOVE * tics : BASEMOVE * tics;