revert

FileEX · FileEX · commit 56039fca51ef · 2025-01-01T19:27:29.000+01:00
diff --git a/Client/mods/deathmatch/logic/CClientPad.cpp b/Client/mods/deathmatch/logic/CClientPad.cpp
@@ -17,6 +17,8 @@
 
 #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
@@ -35,22 +35,22 @@ class CClientPad
 
     void DoPulse(CClientPed* pPed);
 
-    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 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);
 
-    void ProcessSetAnalogControlState(CControllerState& cs, bool bOnFoot);
-    void ProcessControl(short& usControlValue, unsigned int uiIndex);
+    static void ProcessSetAnalogControlState(CControllerState& cs, bool bOnFoot);
+    static 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 bool m_bFlyWithMouse;
-    static bool m_bSteerWithMouse;
+    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;
 
 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
@@ -2960,7 +2960,7 @@ void CClientPed::ApplyControllerStateFixes(CControllerState& Current)
         // Process our scripted control settings
         bool bOnFoot = pVehicle ? false : true;
         CClientPad::ProcessAllToggledControls(Current, bOnFoot);
-        m_Pad.ProcessSetAnalogControlState(Current, bOnFoot);
+        CClientPad::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,12 +1725,10 @@ 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 (pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, false))
+            if (CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, false))
             {
                 bState = fState > 0;
                 return true;
@@ -1767,7 +1765,7 @@ bool CStaticFunctionDefinitions::GetPedAnalogControlState(CClientPed& Ped, const
 
         // check it's analog or use binary.
         if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))
-            Ped.m_Pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput);
+            CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput);
         else
             fState = CClientPad::GetControlState(szControl, cs, bOnFoot) == true ? 1.0f : 0.0f;
 
@@ -7198,7 +7196,7 @@ bool CStaticFunctionDefinitions::GetAnalogControlState(const char* szControl, fl
     else
         pLocalPlayer->GetControllerState(cs);
 
-    if (pLocalPlayer->m_Pad.GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput))
+    if (CClientPad::GetAnalogControlState(szControl, cs, bOnFoot, fState, bRawInput))
     {
         return true;
     }
@@ -7225,13 +7223,12 @@ 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 (pLocalPlayer->m_Pad.SetAnalogControlState(szControl, 1.0, false))
+            if (CClientPad::SetAnalogControlState(szControl, 1.0, false))
             {
                 return true;
             }
@@ -7251,7 +7248,7 @@ bool CStaticFunctionDefinitions::SetControlState(const char* szControl, bool bSt
     {
         if (CClientPad::GetAnalogControlIndex(szControl, uiIndex))
         {
-            pLocalPlayer->m_Pad.RemoveSetAnalogControlState(szControl);
+            CClientPad::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,8 +308,6 @@ int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)
     CScriptArgReader argStream(luaVM);
     argStream.ReadString(strControlState);
 
-    CClientPlayer* localPlayer = CStaticFunctionDefinitions::GetLocalPlayer();
-
     if (!argStream.HasErrors())
     {
         if (argStream.NextIsNumber())
@@ -318,15 +316,15 @@ int CLuaFunctionDefs::SetAnalogControlState(lua_State* luaVM)
             if (argStream.NextIsBool())
                 argStream.ReadBool(bForceOverrideNextFrame, false);
 
-            if (localPlayer->m_Pad.SetAnalogControlState(strControlState, fState, bForceOverrideNextFrame))
+            if (CClientPad::SetAnalogControlState(strControlState, fState, bForceOverrideNextFrame))
             {
                 lua_pushboolean(luaVM, true);
                 return 1;
             }
         }
         else if (argStream.NextIsNone())
         {
-            localPlayer->m_Pad.RemoveSetAnalogControlState(strControlState);
+            CClientPad::RemoveSetAnalogControlState(strControlState);
             lua_pushboolean(luaVM, true);
             return 1;
         }

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