Add instant parameter for setCameraFieldOfView (Fixes #4274)

Author: botder

Client/game_sa/CSettingsSA.cpp

@@ -16,6 +16,8 @@
 #include "CGameSA.h"
 #include "CHudSA.h"
 #include "CSettingsSA.h"
+#include "CCameraSA.h"
+#include "CCamSA.h"
 
 extern CCoreInterface* g_pCore;
 extern CGameSA*        pGame;
@@ -525,36 +527,73 @@ void CSettingsSA::ResetFieldOfViewFromScript()
     UpdateFieldOfViewFromSettings();
 }
 
-void CSettingsSA::SetFieldOfViewPlayer(float fAngle, bool bFromScript)
+static std::pair<CCam*, unsigned int> GetActiveCamPlusMode()
+{
+    CCam* cam = pGame->GetCamera()->GetCam(pGame->GetCamera()->GetActiveCam());
+
+    if (cam == nullptr)
+        return std::make_pair(cam, MODE_NONE);
+
+    return std::make_pair(cam, cam->GetMode());
+}
+
+void CSettingsSA::SetFieldOfViewPlayer(float fAngle, bool bFromScript, bool instant)
 {
     if (!bFromScript && ms_bFOVPlayerFromScript)
         return;
+
     ms_bFOVPlayerFromScript = bFromScript;
     ms_fFOV = fAngle;
+
+    // CCam::Process_FollowPed_SA
     MemPut<void*>(0x0522F3A, &ms_fFOV);
     MemPut<void*>(0x0522F5D, &ms_fFOV);
     MemPut<float>(0x0522F7A, ms_fFOV);
+
+    if (instant)
+    {
+        const auto pair = GetActiveCamPlusMode();
+
+        if (pair.second == MODE_FOLLOWPED)
+            pair.first->SetFOV(fAngle);
+    }
 }
 
-void CSettingsSA::SetFieldOfViewVehicle(float fAngle, bool bFromScript)
+void CSettingsSA::SetFieldOfViewVehicle(float fAngle, bool bFromScript, bool instant)
 {
     if (!bFromScript && ms_bFOVVehicleFromScript)
         return;
+
     ms_bFOVVehicleFromScript = bFromScript;
     ms_fFOVCar = fAngle;
+
+    // CCam::Process_FollowCar_SA
     MemPut<void*>(0x0524B76, &ms_fFOVCar);
     MemPut<void*>(0x0524B9A, &ms_fFOVCar);
     MemPut<void*>(0x0524BA2, &ms_fFOVCar);
     MemPut<void*>(0x0524BD3, &ms_fFOVCar);
     MemPut<float>(0x0524BE4, ms_fFOVCar);
+
+    if (instant)
+    {
+        const auto pair = GetActiveCamPlusMode();
+
+        if (pair.second == MODE_BEHINDCAR || pair.second == MODE_CAM_ON_A_STRING || pair.second == MODE_BEHINDBOAT)
+            pair.first->SetFOV(fAngle);
+    }
 }
 
-void CSettingsSA::SetFieldOfViewVehicleMax(float fAngle, bool bFromScript)
+void CSettingsSA::SetFieldOfViewVehicleMax(float fAngle, bool bFromScript, bool instant)
 {
+    (void)instant;
+
     if (!bFromScript && ms_bFOVVehicleFromScript)
         return;
+
     ms_bFOVVehicleFromScript = bFromScript;
     ms_fFOVCarMax = fAngle;
+
+    // CCam::Process_FollowCar_SA
     MemPut<void*>(0x0524BB4, &ms_fFOVCarMax);
     MemPut<float>(0x0524BC5, ms_fFOVCarMax);
 }

Client/game_sa/CSettingsSA.h

@@ -162,9 +162,9 @@ class CSettingsSA : public CGameSettings
 
     void  UpdateFieldOfViewFromSettings();
     void  ResetFieldOfViewFromScript();
-    void  SetFieldOfViewPlayer(float fAngle, bool bFromScript);
-    void  SetFieldOfViewVehicle(float fAngle, bool bFromScript);
-    void  SetFieldOfViewVehicleMax(float fAngle, bool bFromScript);
+    void  SetFieldOfViewPlayer(float fAngle, bool bFromScript, bool instant = false);
+    void  SetFieldOfViewVehicle(float fAngle, bool bFromScript, bool instant = false);
+    void  SetFieldOfViewVehicleMax(float fAngle, bool bFromScript, bool instant = false);
     float GetFieldOfViewPlayer();
     float GetFieldOfViewVehicle();
     float GetFieldOfViewVehicleMax();

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

@@ -13,6 +13,7 @@
 #include "StdInc.h"
 #include <game/CPlayerInfo.h>
 #include <game/CSettings.h>
+#include <game/CCam.h>
 #include <lua/CLuaFunctionParser.h>
 
 #define MIN_CLIENT_REQ_SETCAMERATARGET_USE_ANY_ELEMENTS "1.5.8-9.20979"
@@ -215,10 +216,11 @@ int CLuaCameraDefs::SetCameraFieldOfView(lua_State* luaVM)
 {
     float            fFOV;
     eFieldOfViewMode eMode;
+    bool             instant;
     CScriptArgReader argStream(luaVM);
-
     argStream.ReadEnumString(eMode);
     argStream.ReadNumber(fFOV);
+    argStream.ReadBool(instant, false);
 
     if (!argStream.HasErrors())
     {
@@ -231,11 +233,17 @@ int CLuaCameraDefs::SetCameraFieldOfView(lua_State* luaVM)
             }
 
             if (eMode == FOV_MODE_PLAYER)
-                g_pGame->GetSettings()->SetFieldOfViewPlayer(fFOV, true);
+            {
+                g_pGame->GetSettings()->SetFieldOfViewPlayer(fFOV, true, instant);
+            }
             else if (eMode == FOV_MODE_VEHICLE)
-                g_pGame->GetSettings()->SetFieldOfViewVehicle(fFOV, true);
+            {
+                g_pGame->GetSettings()->SetFieldOfViewVehicle(fFOV, true, instant);
+            }
             else if (eMode == FOV_MODE_VEHICLE_MAX)
-                g_pGame->GetSettings()->SetFieldOfViewVehicleMax(fFOV, true);
+            {
+                g_pGame->GetSettings()->SetFieldOfViewVehicleMax(fFOV, true, instant);
+            }
             else
             {
                 argStream.m_iIndex = 1;
@@ -567,4 +575,4 @@ bool CLuaCameraDefs::ResetShakeCamera() noexcept
 {
     m_pManager->GetCamera()->ResetShakeCamera();
     return true;
-}
+}

Client/sdk/game/CSettings.h

@@ -155,9 +155,9 @@ class CGameSettings
 
     virtual void UpdateFieldOfViewFromSettings() = 0;
     virtual void ResetFieldOfViewFromScript() = 0;
-    virtual void SetFieldOfViewPlayer(float fAngle, bool bFromScript) = 0;
-    virtual void SetFieldOfViewVehicle(float fAngle, bool bFromScript) = 0;
-    virtual void SetFieldOfViewVehicleMax(float fAngle, bool bFromScript) = 0;
+    virtual void SetFieldOfViewPlayer(float fAngle, bool bFromScript, bool instant = false) = 0;
+    virtual void SetFieldOfViewVehicle(float fAngle, bool bFromScript, bool instant = false) = 0;
+    virtual void SetFieldOfViewVehicleMax(float fAngle, bool bFromScript, bool instant = false) = 0;
 
     virtual float GetFieldOfViewPlayer() = 0;
     virtual float GetFieldOfViewVehicle() = 0;