Fix bug

FileEX · FileEX · commit f76207749a9d · 2025-01-01T12:27:27.000+01:00
diff --git a/Client/mods/deathmatch/logic/CClientPad.cpp b/Client/mods/deathmatch/logic/CClientPad.cpp
@@ -17,8 +17,6 @@
 
 #define CS_NAN -32768
 
-SFixedArray<short, MAX_GTA_CONTROLS>       CClientPad::m_sScriptedStates;
-SFixedArray<bool, MAX_GTA_ANALOG_CONTROLS> CClientPad::m_bScriptedStatesNextFrameOverride;
 bool                                       CClientPad::m_bFlyWithMouse;
 bool                                       CClientPad::m_bSteerWithMouse;
 
diff --git a/Client/mods/deathmatch/logic/CClientPad.h b/Client/mods/deathmatch/logic/CClientPad.h
@@ -34,22 +34,22 @@ class CClientPad
 
     void DoPulse(CClientPed* pPed);
 
-    static bool GetAnalogControlState(const char* szName, CControllerState& cs, bool bOnFoot, float& fState, bool bIgnoreOverrides);
-    static bool SetAnalogControlState(const char* szName, float fState, bool bFrameForced);
-    static void RemoveSetAnalogControlState(const char* szName);
+    bool GetAnalogControlState(const char* szName, CControllerState& cs, bool bOnFoot, float& fState, bool bIgnoreOverrides);
+    bool SetAnalogControlState(const char* szName, float fState, bool bFrameForced);
+    void RemoveSetAnalogControlState(const char* szName);
 
-    static void ProcessSetAnalogControlState(CControllerState& cs, bool bOnFoot);
-    static void ProcessControl(short& usControlValue, unsigned int uiIndex);
+    void ProcessSetAnalogControlState(CControllerState& cs, bool bOnFoot);
+    void ProcessControl(short& usControlValue, unsigned int uiIndex);
 
     static void ProcessAllToggledControls(CControllerState& cs, bool bOnFoot);
     static bool ProcessToggledControl(const char* szName, CControllerState& cs, bool bOnFoot, bool bEnabled);
     static bool GetControlState(const char* szName, CControllerState& State, bool bOnFoot);
 
-    static SFixedArray<short, MAX_GTA_CONTROLS>       m_sScriptedStates;
-    static SFixedArray<bool, MAX_GTA_ANALOG_CONTROLS> m_bScriptedStatesNextFrameOverride;
-    static bool                                       m_bFlyWithMouse;
-    static bool                                       m_bSteerWithMouse;
+    static bool m_bFlyWithMouse;
+    static bool m_bSteerWithMouse;
 
 protected:
     SFixedArray<float, MAX_GTA_CONTROLS> m_fStates;
+    SFixedArray<short, MAX_GTA_CONTROLS> m_sScriptedStates;
+    SFixedArray<bool, MAX_GTA_ANALOG_CONTROLS> m_bScriptedStatesNextFrameOverride;
 };
diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp
@@ -2957,7 +2957,7 @@ void CClientPed::ApplyControllerStateFixes(CControllerState& Current)
         // Process our scripted control settings
         bool bOnFoot = pVehicle ? false : true;
         CClientPad::ProcessAllToggledControls(Current, bOnFoot);
-        CClientPad::ProcessSetAnalogControlState(Current, bOnFoot);
+        m_Pad.ProcessSetAnalogControlState(Current, bOnFoot);
     }
 
     // Is the player stealth aiming?
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -1725,10 +1725,12 @@ bool CStaticFunctionDefinitions::GetPedControlState(CClientPed& Ped, const char*
         bState = CClientPad::GetControlState(szControl, cs, bOnFoot);
         float        fState = 0;
         unsigned int uiIndex;
+        CClientPad pad = Ped.m_Pad;
+
         // Check it's Analog
         if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))
         {
-            if (CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, false))
+            if (pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, false))
             {
                 bState = fState > 0;
                 return true;
@@ -1765,7 +1767,7 @@ bool CStaticFunctionDefinitions::GetPedAnalogControlState(CClientPed& Ped, const
 
         // check it's analog or use binary.
         if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))
-            CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput);
+            Ped.m_Pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput);
         else
             fState = CClientPad::GetControlState(szControl, cs, bOnFoot) == true ? 1.0f : 0.0f;
 
@@ -7196,7 +7198,7 @@ bool CStaticFunctionDefinitions::GetAnalogControlState(const char* szControl, fl
     else
         pLocalPlayer->GetControllerState(cs);
 
-    if (CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput))
+    if (pLocalPlayer->m_Pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput))
     {
         return true;
     }
@@ -7223,12 +7225,13 @@ bool CStaticFunctionDefinitions::SetControlState(const char* szControl, bool bSt
 {
     assert(szControl);
     unsigned int uiIndex;
+    CClientPlayer* pLocalPlayer = m_pPlayerManager->GetLocalPlayer();
 
     if (bState)
     {
         if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))
         {
-            if (CClientPad::SetAnalogControlState(szControl, 1.0, false))
+            if (pLocalPlayer->m_Pad.SetAnalogControlState(szControl, 1.0, false))
             {
                 return true;
             }
@@ -7248,7 +7251,7 @@ bool CStaticFunctionDefinitions::SetControlState(const char* szControl, bool bSt
     {
         if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))
         {
-            CClientPad::RemoveSetAnalogControlState(szControl);
+            pLocalPlayer->m_Pad.RemoveSetAnalogControlState(szControl);
             return true;
         }
         else
diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Input.cpp b/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Input.cpp
@@ -308,6 +308,8 @@ int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)
     CScriptArgReader argStream(luaVM);
     argStream.ReadString(strControlState);
 
+    CClientPlayer* localPlayer = CStaticFunctionDefinitions::GetLocalPlayer();
+
     if (!argStream.HasErrors())
     {
         if (argStream.NextIsNumber())
@@ -316,15 +318,15 @@ int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)
             if (argStream.NextIsBool())
                 argStream.ReadBool(bForceOverrideNextFrame, false);
 
-            if (CClientPad::SetAnalogControlState(strControlState, fState, bForceOverrideNextFrame))
+            if (localPlayer->m_Pad.SetAnalogControlState(strControlState, fState, bForceOverrideNextFrame))
             {
                 lua_pushboolean(luaVM, true);
                 return 1;
             }
         }
         else if (argStream.NextIsNone())
         {
-            CClientPad::RemoveSetAnalogControlState(strControlState);
+            localPlayer->m_Pad.RemoveSetAnalogControlState(strControlState);
             lua_pushboolean(luaVM, true);
             return 1;
         }

Original file line number	Diff line number	Diff line change
`@@ -2957,7 +2957,7 @@ void CClientPed::ApplyControllerStateFixes(CControllerState& Current)`
`2957`	`2957`	`// Process our scripted control settings`
`2958`	`2958`	`bool bOnFoot = pVehicle ? false : true;`
`2959`	`2959`	`CClientPad::ProcessAllToggledControls(Current, bOnFoot);`
`2960`		`- CClientPad::ProcessSetAnalogControlState(Current, bOnFoot);`
	`2960`	`+ m_Pad.ProcessSetAnalogControlState(Current, bOnFoot);`
`2961`	`2961`	`}`
`2962`	`2962`
`2963`	`2963`	`// Is the player stealth aiming?`
Original file line number	Diff line number	Diff line change
`@@ -1725,10 +1725,12 @@ bool CStaticFunctionDefinitions::GetPedControlState(CClientPed& Ped, const char*`
`1725`	`1725`	`bState = CClientPad::GetControlState(szControl, cs, bOnFoot);`
`1726`	`1726`	`float fState = 0;`
`1727`	`1727`	`unsigned int uiIndex;`
	`1728`	`+ CClientPad pad = Ped.m_Pad;`
	`1729`	`+`
`1728`	`1730`	`// Check it's Analog`
`1729`	`1731`	`if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))`
`1730`	`1732`	`{`
`1731`		`- if (CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, false))`
	`1733`	`+ if (pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, false))`
`1732`	`1734`	`{`
`1733`	`1735`	`bState = fState > 0;`
`1734`	`1736`	`return true;`
`@@ -1765,7 +1767,7 @@ bool CStaticFunctionDefinitions::GetPedAnalogControlState(CClientPed& Ped, const`
`1765`	`1767`
`1766`	`1768`	`// check it's analog or use binary.`
`1767`	`1769`	`if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))`
`1768`		`- CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput);`
	`1770`	`+ Ped.m_Pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput);`
`1769`	`1771`	`else`
`1770`	`1772`	`fState = CClientPad::GetControlState(szControl, cs, bOnFoot) == true ? 1.0f : 0.0f;`
`1771`	`1773`
`@@ -7196,7 +7198,7 @@ bool CStaticFunctionDefinitions::GetAnalogControlState(const char* szControl, fl`
`7196`	`7198`	`else`
`7197`	`7199`	`pLocalPlayer->GetControllerState(cs);`
`7198`	`7200`
`7199`		`- if (CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput))`
	`7201`	`+ if (pLocalPlayer->m_Pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput))`
`7200`	`7202`	`{`
`7201`	`7203`	`return true;`
`7202`	`7204`	`}`
`@@ -7223,12 +7225,13 @@ bool CStaticFunctionDefinitions::SetControlState(const char* szControl, bool bSt`
`7223`	`7225`	`{`
`7224`	`7226`	`assert(szControl);`
`7225`	`7227`	`unsigned int uiIndex;`
	`7228`	`+ CClientPlayer* pLocalPlayer = m_pPlayerManager->GetLocalPlayer();`
`7226`	`7229`
`7227`	`7230`	`if (bState)`
`7228`	`7231`	`{`
`7229`	`7232`	`if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))`
`7230`	`7233`	`{`
`7231`		`- if (CClientPad::SetAnalogControlState(szControl, 1.0, false))`
	`7234`	`+ if (pLocalPlayer->m_Pad.SetAnalogControlState(szControl, 1.0, false))`
`7232`	`7235`	`{`
`7233`	`7236`	`return true;`
`7234`	`7237`	`}`
`@@ -7248,7 +7251,7 @@ bool CStaticFunctionDefinitions::SetControlState(const char* szControl, bool bSt`
`7248`	`7251`	`{`
`7249`	`7252`	`if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))`
`7250`	`7253`	`{`
`7251`		`- CClientPad::RemoveSetAnalogControlState(szControl);`
	`7254`	`+ pLocalPlayer->m_Pad.RemoveSetAnalogControlState(szControl);`
`7252`	`7255`	`return true;`
`7253`	`7256`	`}`
`7254`	`7257`	`else`
Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,8 @@ int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)`
`308`	`308`	`CScriptArgReader argStream(luaVM);`
`309`	`309`	`argStream.ReadString(strControlState);`
`310`	`310`
	`311`	`+ CClientPlayer* localPlayer = CStaticFunctionDefinitions::GetLocalPlayer();`
	`312`	`+`
`311`	`313`	`if (!argStream.HasErrors())`
`312`	`314`	`{`
`313`	`315`	`if (argStream.NextIsNumber())`
`@@ -316,15 +318,15 @@ int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)`
`316`	`318`	`if (argStream.NextIsBool())`
`317`	`319`	`argStream.ReadBool(bForceOverrideNextFrame, false);`
`318`	`320`
`319`		`- if (CClientPad::SetAnalogControlState(strControlState, fState, bForceOverrideNextFrame))`
	`321`	`+ if (localPlayer->m_Pad.SetAnalogControlState(strControlState, fState, bForceOverrideNextFrame))`
`320`	`322`	`{`
`321`	`323`	`lua_pushboolean(luaVM, true);`
`322`	`324`	`return 1;`
`323`	`325`	`}`
`324`	`326`	`}`
`325`	`327`	`else if (argStream.NextIsNone())`
`326`	`328`	`{`
`327`		`- CClientPad::RemoveSetAnalogControlState(strControlState);`
	`329`	`+ localPlayer->m_Pad.RemoveSetAnalogControlState(strControlState);`
`328`	`330`	`lua_pushboolean(luaVM, true);`
`329`	`331`	`return 1;`
`330`	`332`	`}`