Synchronize changes from 1.6 master branch [ci skip]

d9c2793 Appendum #3585 - fix shakeCamera running infinitely (#3616)

Author: github-actions[bot]

Client/game_sa/CCameraSA.cpp

@@ -446,15 +446,15 @@ float CCameraSA::GetShakeForce()
 
 void CCameraSA::ShakeCamera(float radius, float x, float y, float z) noexcept
 {
-    DWORD               dwFunc = FUNC_ShakeCam;
-    CCameraSAInterface* cameraInterface = GetInterface();
-    _asm
-    {
-        mov  ecx, cameraInterface
-        push z
-        push y
-        push x
-        push radius
-        call dwFunc
-    }
+    static CCameraSAInterface* cameraInterface = GetInterface();
+    if (radius <= 0.0f)
+        return ResetShakeCamera();
+
+    using ShakeCamera_t = void(__thiscall*)(CCameraSAInterface*, float radius, float x, float y, float z);
+    ((ShakeCamera_t)FUNC_ShakeCam)(cameraInterface, radius, x, y, z);
+}
+
+void CCameraSA::ResetShakeCamera() noexcept
+{
+    GetInterface()->m_fCamShakeForce = 0.0f;
 }

Client/game_sa/CCameraSA.h

@@ -429,4 +429,5 @@ class CCameraSA : public CCamera
     float     GetShakeForce();
 
     void ShakeCamera(float radius, float x, float y, float z) noexcept override;
+    void ResetShakeCamera() noexcept override;
 };

Client/mods/deathmatch/logic/CClientCamera.cpp

@@ -639,3 +639,8 @@ void CClientCamera::ShakeCamera(float radius, float x, float y, float z) noexcep
 {
     m_pCamera->ShakeCamera(radius, x, y, z);
 }
+
+void CClientCamera::ResetShakeCamera() noexcept
+{
+    m_pCamera->ResetShakeCamera();
+}

Client/mods/deathmatch/logic/CClientCamera.h

@@ -65,6 +65,7 @@ class CClientCamera final : public CClientEntity
     void           Reset();
 
     void ShakeCamera(float radius, float x, float y, float z) noexcept;
+    void ResetShakeCamera() noexcept;
 
     void            SetCameraVehicleViewMode(eVehicleCamMode eMode);
     void            SetCameraPedViewMode(ePedCamMode eMode);

Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp

@@ -43,6 +43,7 @@ void CLuaCameraDefs::LoadFunctions()
         {"setCameraDrunkLevel", ArgumentParserWarn<false, SetCameraDrunkLevel>},
 
         {"shakeCamera", ArgumentParser<ShakeCamera>},
+        {"resetShakeCamera", ArgumentParser<ResetShakeCamera>},
     };
 
     // Add functions
@@ -561,3 +562,9 @@ bool CLuaCameraDefs::ShakeCamera(float radius, std::optional<float> x, std::opti
 
     return true;
 }
+
+bool CLuaCameraDefs::ResetShakeCamera() noexcept
+{
+    m_pManager->GetCamera()->ResetShakeCamera();
+    return true;
+}

Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h

@@ -45,6 +45,7 @@ class CLuaCameraDefs : public CLuaDefs
 
     // Cam do funcs
     static bool ShakeCamera(float radius, std::optional<float> x, std::optional<float> y, std::optional<float> z) noexcept;
+    static bool ResetShakeCamera() noexcept;
 
     // For OOP only
     LUA_DECLARE(OOP_GetCameraPosition);

Client/sdk/game/CCamera.h

@@ -144,5 +144,6 @@ class CCamera
     virtual void      SetShakeForce(float fShakeForce) = 0;
     virtual float     GetShakeForce() = 0;
 
-    virtual void      ShakeCamera(float radius, float x, float y, float z) noexcept = 0;
+    virtual void ShakeCamera(float radius, float x, float y, float z) noexcept = 0;
+    virtual void ResetShakeCamera() noexcept = 0;
 };