From 25afea4950028d42195d6ea70c72ca16db8d9712 Mon Sep 17 00:00:00 2001
From: tmyqlfpir <80724828+tmyqlfpir@users.noreply.github.com>
Date: Fri, 13 Sep 2024 08:14:19 +1000
Subject: [PATCH] Blood: Add support for isolated deadzones

---
 source/blood/src/_functio.h | 15 ++++++++++++---
 source/blood/src/config.cpp | 16 ++++++++++++++++
 source/blood/src/config.h   |  1 +
 source/blood/src/menu.cpp   | 26 +++++++++++++++++++++++---
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/source/blood/src/_functio.h b/source/blood/src/_functio.h
index b3b3dea50..e2c9aea97 100644
--- a/source/blood/src/_functio.h
+++ b/source/blood/src/_functio.h
@@ -343,7 +343,7 @@ static const int32_t joystickanalogscaledefaults[MAXJOYAXES] =
    DEFAULTJOYSTICKANALOGUESCALE,
    DEFAULTJOYSTICKANALOGUESCALE,
    DEFAULTJOYSTICKANALOGUESCALE/2,
-   DEFAULTJOYSTICKANALOGUESCALE/4
+   DEFAULTJOYSTICKANALOGUESCALE/4,
    };
 
 
@@ -352,7 +352,16 @@ static const int32_t joystickanalogdeaddefaults[MAXJOYAXES] =
    DEFAULTJOYSTICKANALOGUEDEAD*5,
    DEFAULTJOYSTICKANALOGUEDEAD*4,
    DEFAULTJOYSTICKANALOGUEDEAD*2,
-   DEFAULTJOYSTICKANALOGUEDEAD*2
+   DEFAULTJOYSTICKANALOGUEDEAD*2,
+   };
+
+
+static const int32_t joystickanalogisolateddeaddefaults[MAXJOYAXES] =
+   {
+   1,
+   0,
+   0,
+   0,
    };
 
 
@@ -361,7 +370,7 @@ static const int32_t joystickanalogsaturatedefaults[MAXJOYAXES] =
    DEFAULTJOYSTICKANALOGUESATURATE*3,
    DEFAULTJOYSTICKANALOGUESATURATE*3,
    DEFAULTJOYSTICKANALOGUESATURATE*2,
-   DEFAULTJOYSTICKANALOGUESATURATE*2
+   DEFAULTJOYSTICKANALOGUESATURATE*2,
    };
 
 
diff --git a/source/blood/src/config.cpp b/source/blood/src/config.cpp
index 54a4e8199..8c21f8015 100644
--- a/source/blood/src/config.cpp
+++ b/source/blood/src/config.cpp
@@ -65,6 +65,7 @@ int32_t JoystickAnalogueScale[MAXJOYAXES];
 int32_t JoystickAnalogueDead[MAXJOYAXES];
 int32_t JoystickAnalogueSaturate[MAXJOYAXES];
 int32_t JoystickAnalogueInvert[MAXJOYAXES];
+int32_t JoystickAnalogueIsolatedDeadZone[MAXJOYAXES];
 uint8_t KeyboardKeys[NUMGAMEFUNCTIONS][2];
 int32_t scripthandle;
 int32_t setupread;
@@ -479,6 +480,9 @@ void CONFIG_SetDefaults(void)
 
         JoystickAnalogueInvert[i] = 0;
         CONTROL_SetAnalogAxisInvert(i, JoystickAnalogueInvert[i]);
+
+        JoystickAnalogueIsolatedDeadZone[i] = joystickanalogisolateddeaddefaults[i];
+        JOYSTICK_SetAxisIsolatedDeadZone(i, JoystickAnalogueIsolatedDeadZone[i]);
     }
 #else
     for (int i=0; i<MAXJOYBUTTONSANDHATS; i++)
@@ -507,6 +511,9 @@ void CONFIG_SetDefaults(void)
 
         JoystickAnalogueInvert[i] = 0;
         CONTROL_SetAnalogAxisInvert(i, JoystickAnalogueInvert[i]);
+
+        JoystickAnalogueIsolatedDeadZone[i] = joystickanalogisolateddeaddefaults[i];
+        JOYSTICK_SetAxisIsolatedDeadZone(i, JoystickAnalogueIsolatedDeadZone[i]);
     }
 #endif
 }
@@ -668,6 +675,11 @@ void CONFIG_SetupJoystick(void)
         scale = JoystickAnalogueInvert[i];
         SCRIPT_GetNumber(scripthandle, "Controls", str,&scale);
         JoystickAnalogueInvert[i] = scale;
+
+        Bsprintf(str,"JoystickAnalogueIsolatedDeadZone%d",i);
+        scale = JoystickAnalogueIsolatedDeadZone[i];
+        SCRIPT_GetNumber(scripthandle, "Controls", str,&scale);
+        JoystickAnalogueIsolatedDeadZone[i] = scale;
     }
 
     for (i=0; i<MAXJOYBUTTONSANDHATS; i++)
@@ -683,6 +695,7 @@ void CONFIG_SetupJoystick(void)
         CONTROL_SetAnalogAxisScale(i, JoystickAnalogueScale[i], controldevice_joystick);
         JOYSTICK_SetDeadZone(i, JoystickAnalogueDead[i], JoystickAnalogueSaturate[i]);
         CONTROL_SetAnalogAxisInvert(i, JoystickAnalogueInvert[i]);
+        JOYSTICK_SetAxisIsolatedDeadZone(i, JoystickAnalogueIsolatedDeadZone[i]);
     }
 }
 
@@ -983,6 +996,9 @@ void CONFIG_WriteSetup(uint32_t flags)
 
             Bsprintf(buf, "JoystickAnalogInvert%d", dummy);
             SCRIPT_PutNumber(scripthandle, "Controls", buf, JoystickAnalogueInvert[dummy], FALSE, FALSE);
+
+            Bsprintf(buf, "JoystickAnalogueIsolatedDeadZone%d", dummy);
+            SCRIPT_PutNumber(scripthandle, "Controls", buf, JoystickAnalogueIsolatedDeadZone[dummy], FALSE, FALSE);
         }
     }
 
diff --git a/source/blood/src/config.h b/source/blood/src/config.h
index 19715aa56..728d63606 100644
--- a/source/blood/src/config.h
+++ b/source/blood/src/config.h
@@ -46,6 +46,7 @@ extern int32_t JoystickAnalogueScale[MAXJOYAXES];
 extern int32_t JoystickAnalogueDead[MAXJOYAXES];
 extern int32_t JoystickAnalogueSaturate[MAXJOYAXES];
 extern int32_t JoystickAnalogueInvert[MAXJOYAXES];
+extern int32_t JoystickAnalogueIsolatedDeadZone[MAXJOYAXES];
 extern uint8_t KeyboardKeys[NUMGAMEFUNCTIONS][2];
 extern int32_t scripthandle;
 extern int32_t setupread;
diff --git a/source/blood/src/menu.cpp b/source/blood/src/menu.cpp
index 6c4c6de21..355fa3124 100644
--- a/source/blood/src/menu.cpp
+++ b/source/blood/src/menu.cpp
@@ -705,6 +705,7 @@ void SetJoystickDigitalPos(CGameMenuItemZCycle* pItem);
 void SetJoystickDigitalNeg(CGameMenuItemZCycle* pItem);
 void SetJoystickDeadzone(CGameMenuItemSlider* pItem);
 void SetJoystickSaturate(CGameMenuItemSlider* pItem);
+void SetJoystickIsolatedDeadzone(CGameMenuItemZBool* pItem);
 
 CGameMenuItemTitle itemOptionsControlTitle("CONTROL SETUP", 1, 160, 20, 2038);
 CGameMenuItemChain itemOptionsControlKeyboard("KEYBOARD SETUP", 1, 0, 60, 320, 1, &menuOptionsControlKeyboard, -1, NULL, 0);
@@ -829,6 +830,7 @@ CGameMenuItemZCycle *pItemOptionsControlJoystickAxisDigitalPos[MAXJOYAXES];
 CGameMenuItemZCycle *pItemOptionsControlJoystickAxisDigitalNeg[MAXJOYAXES];
 CGameMenuItemSlider *pItemOptionsControlJoystickAxisDeadzone[MAXJOYAXES];
 CGameMenuItemSlider *pItemOptionsControlJoystickAxisSaturate[MAXJOYAXES];
+CGameMenuItemZBool *pItemOptionsControlJoystickAxisIsolatedDeadzone[MAXJOYAXES];
 
 void SetupLoadingScreen(void)
 {
@@ -1543,11 +1545,11 @@ void SetupOptionsMenu(void)
         pItemOptionsControlJoystickAxisName[nAxis] = new CGameMenuItemTitle(MenuJoyAxisNames[nAxis], 3, 160, y, -1); // get axis name
         dassert(pItemOptionsControlJoystickAxisName[nAxis] != NULL);
         menuOptionsControlJoystickAxis[nAxis].Add(pItemOptionsControlJoystickAxisName[nAxis], false);
-        y += 12;
+        y += 10;
         pItemOptionsControlJoystickAxisScale[nAxis] = new CGameMenuItemSlider("AXIS SCALE:", 1, 18, y, 280, &JoystickAnalogueScale[nAxis], fix16_from_int(0), fix16_from_float(2.f), fix16_from_float(0.025f), SetJoystickScale, -1, -1, kMenuSliderQ16); // get axis scale
         dassert(pItemOptionsControlJoystickAxisScale[nAxis] != NULL);
         menuOptionsControlJoystickAxis[nAxis].Add(pItemOptionsControlJoystickAxisScale[nAxis], true);
-        y += 25;
+        y += 22;
         pItemOptionsControlJoystickAxisAnalogue[nAxis] = new CGameMenuItemZCycle("ANALOG:", 1, 18, y, 280, 0, SetJoystickAnalogue, zJoystickAnalogue, ARRAY_SSIZE(zJoystickAnalogue), 0); // get analog function
         dassert(pItemOptionsControlJoystickAxisAnalogue[nAxis] != NULL);
         menuOptionsControlJoystickAxis[nAxis].Add(pItemOptionsControlJoystickAxisAnalogue[nAxis], false);
@@ -1563,7 +1565,7 @@ void SetupOptionsMenu(void)
         pItemOptionsControlJoystickAxisDigitalNeg[nAxis] = new CGameMenuItemZCycle("DIGITAL -:", 1, 18, y, 280, 0, SetJoystickDigitalNeg, pzGamefuncsStrings, NUMGAMEFUNCTIONS+1, 0, true); // get digital function
         dassert(pItemOptionsControlJoystickAxisDigitalNeg[nAxis] != NULL);
         menuOptionsControlJoystickAxis[nAxis].Add(pItemOptionsControlJoystickAxisDigitalNeg[nAxis], false);
-        y += 25;
+        y += 22;
         pItemOptionsControlJoystickAxisDeadzone[nAxis] = new CGameMenuItemSlider("DEAD ZONE:", 1, 18, y, 280, &JoystickAnalogueDead[nAxis], fix16_from_int(0), fix16_from_float(0.5f), fix16_from_float(0.025f), SetJoystickDeadzone, -1, -1, kMenuSliderPercent); // get dead size
         dassert(pItemOptionsControlJoystickAxisDeadzone[nAxis] != NULL);
         menuOptionsControlJoystickAxis[nAxis].Add(pItemOptionsControlJoystickAxisDeadzone[nAxis], false);
@@ -1571,6 +1573,10 @@ void SetupOptionsMenu(void)
         pItemOptionsControlJoystickAxisSaturate[nAxis] = new CGameMenuItemSlider("SATURATE:", 1, 18, y, 280, &JoystickAnalogueSaturate[nAxis], fix16_from_int(0), fix16_from_float(0.5f), fix16_from_float(0.025f), SetJoystickSaturate, -1, -1, kMenuSliderPercent); // get saturate
         dassert(pItemOptionsControlJoystickAxisSaturate[nAxis] != NULL);
         menuOptionsControlJoystickAxis[nAxis].Add(pItemOptionsControlJoystickAxisSaturate[nAxis], false);
+        y += 17;
+        pItemOptionsControlJoystickAxisIsolatedDeadzone[nAxis] = new CGameMenuItemZBool("ISOLATED DEAD ZONE:", 1, 18, y, 280, false, SetJoystickIsolatedDeadzone, NULL, NULL); // get isolated dead
+        dassert(pItemOptionsControlJoystickAxisIsolatedDeadzone[nAxis] != NULL);
+        menuOptionsControlJoystickAxis[nAxis].Add(pItemOptionsControlJoystickAxisIsolatedDeadzone[nAxis], false);
         menuOptionsControlJoystickAxis[nAxis].Add(&itemBloodQAV, false);
     }
 }
@@ -2374,6 +2380,7 @@ void SetupJoystickAxesMenu(CGameMenuItemChain *pItem)
         }
         pItemOptionsControlJoystickAxisDeadzone[nAxis]->nValue = JoystickAnalogueDead[nAxis];
         pItemOptionsControlJoystickAxisSaturate[nAxis]->nValue = JoystickAnalogueSaturate[nAxis];
+        pItemOptionsControlJoystickAxisIsolatedDeadzone[nAxis]->at20 = JoystickAnalogueIsolatedDeadZone[nAxis];
     }
 }
 
@@ -2500,6 +2507,19 @@ void SetJoystickSaturate(CGameMenuItemSlider* pItem)
     }
 }
 
+void SetJoystickIsolatedDeadzone(CGameMenuItemZBool* pItem)
+{
+    for (int nAxis = 0; nAxis < MAXJOYAXES; nAxis++)
+    {
+        if (pItem == pItemOptionsControlJoystickAxisIsolatedDeadzone[nAxis])
+        {
+            JoystickAnalogueIsolatedDeadZone[nAxis] = pItem->at20;
+            JOYSTICK_SetAxisIsolatedDeadZone(nAxis, JoystickAnalogueIsolatedDeadZone[nAxis]);
+            break;
+        }
+    }
+}
+
 void PreDrawControlMouse(CGameMenuItem *pItem)
 {
     if (pItem == &itemOptionsControlMouseVerticalAim)