Add vehicle_bump mode

Author: FileEX

Client/game_sa/CSettingsSA.cpp

@@ -503,6 +503,9 @@ bool  ms_fovAimingFromScript = false;
 bool  ms_fovSniperAimingFromScript = false;
 bool  ms_fov1stPersonAimingFromScript = false;
 
+float ms_fov1stPerson = 60.0f;
+bool  ms_fov1stPersonFromScript = false;
+
 // consider moving this to the camera class - qaisjp
 float CSettingsSA::GetFieldOfViewPlayer()
 {
@@ -542,6 +545,11 @@ float CSettingsSA::GetFieldOfView1stPersonAiming()
     return ms_fov1stPersonAiming;
 }
 
+float CSettingsSA::GetFieldOfViewVehicleBump()
+{
+    return ms_fov1stPerson;
+}
+
 void CSettingsSA::ResetFieldOfViewPlayer()
 {
     float fieldOfView;
@@ -596,6 +604,14 @@ void CSettingsSA::ResetFieldOfView1stPersonAiming()
     ms_fov1stPersonAiming = 70.0f;
 }
 
+void CSettingsSA::ResetFieldOfViewVehicleBump()
+{
+    ms_fov1stPerson = 60.0f;
+    
+    MemCpy((void*)0x517EBA, "\x00\x00\x8C\x42", 4);
+    MemCpy((void*)0x51814B, "\x00\x00\x70\x42", 4);
+}
+
 void CSettingsSA::UpdateFieldOfViewFromSettings()
 {
     float fFieldOfView;
@@ -605,8 +621,10 @@ void CSettingsSA::UpdateFieldOfViewFromSettings()
     SetFieldOfViewVehicle(fFieldOfView, false);
     SetFieldOfViewVehicleMax(100, false);
 
+    ms_fovAiming = 70.0f;
     ResetFieldOfViewSniperAiming();
     ResetFieldOfView1stPersonAiming();
+    ResetFieldOfViewVehicleBump();
 }
 
 void CSettingsSA::ResetFieldOfViewFromScript()
@@ -616,6 +634,7 @@ void CSettingsSA::ResetFieldOfViewFromScript()
     ms_fovAimingFromScript = false;
     ms_fovSniperAimingFromScript = false;
     ms_fov1stPersonAimingFromScript = false;
+    ms_fov1stPersonFromScript = false;
 
     UpdateFieldOfViewFromSettings();
 }
@@ -741,7 +760,8 @@ bool CSettingsSA::SetFieldOfViewSniperAiming(float angle, bool fromScript)
     if (cameraViewMode == MODE_SNIPER)
     {
         cam->SetFOV(angle);
-        *(float*)0x00B6FFE8 = angle;
+
+        *(float*)0xB6FFE8 = angle; // something related to FOV - need it to be set here
     }
 
     ms_fovSniperAimingFromScript = fromScript;
@@ -773,6 +793,20 @@ bool CSettingsSA::SetFieldOfView1stPersonAiming(float angle, bool fromScript)
     return true;
 }
 
+bool CSettingsSA::SetFieldOfViewVehicleBump(float angle, bool fromScript)
+{
+    if (!fromScript && ms_fov1stPersonFromScript)
+        return false;
+
+    ms_fov1stPerson = angle;
+
+    MemCpy((void*)0x517EBA, &ms_fov1stPerson, 4);
+    MemCpy((void*)0x51814B, &ms_fov1stPerson, 4);
+
+    ms_fov1stPersonFromScript = fromScript;
+    return true;
+}
+
 ////////////////////////////////////////////////
 //
 // Vehicles LOD draw distance

Client/game_sa/CSettingsSA.h

@@ -168,17 +168,20 @@ class CSettingsSA : public CGameSettings
     bool  SetFieldOfViewAiming(float angle, bool fromScript);
     bool  SetFieldOfViewSniperAiming(float angle, bool fromScript);
     bool  SetFieldOfView1stPersonAiming(float angle, bool fromScript);
+    bool  SetFieldOfViewVehicleBump(float angle, bool fromScript);
     float GetFieldOfViewPlayer();
     float GetFieldOfViewVehicle();
     float GetFieldOfViewVehicleMax();
     float GetFieldOfViewAiming();
     float GetFieldOfViewSniperAiming();
     float GetFieldOfView1stPersonAiming();
+    float GetFieldOfViewVehicleBump();
     void  ResetFieldOfViewPlayer();
     void  ResetFieldOfViewVehicle();
     void  ResetFieldOfViewVehicleMax();
     void  ResetFieldOfViewSniperAiming();
     void  ResetFieldOfView1stPersonAiming();
+    void  ResetFieldOfViewVehicleBump();
 
     void SetVehiclesLODDistance(float fVehiclesLODDistance, float fTrainsPlanesLODDistance, bool bFromScript);
     void ResetVehiclesLODDistance(bool bForceDefault = false);

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -556,6 +556,7 @@ ADD_ENUM(FOV_MODE_VEHICLE_MAX, "vehicle_max")
 ADD_ENUM(FOV_MODE_AIMING, "aiming")
 ADD_ENUM(FOV_MODE_SNIPER_AIMING, "sniper_aiming")
 ADD_ENUM(FOV_MODE_1ST_PERSON_AIMING, "1stperson_aiming")
+ADD_ENUM(FOV_MODE_VEHICLE_BUMP, "vehicle_bump")
 IMPLEMENT_ENUM_END("fieldofview-mode")
 
 IMPLEMENT_ENUM_BEGIN(eTrayIconType)

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -132,7 +132,8 @@ enum eFieldOfViewMode
     FOV_MODE_VEHICLE_MAX,
     FOV_MODE_AIMING,
     FOV_MODE_SNIPER_AIMING,
-    FOV_MODE_1ST_PERSON_AIMING
+    FOV_MODE_1ST_PERSON_AIMING,
+    FOV_MODE_VEHICLE_BUMP,
 };
 DECLARE_ENUM(eFieldOfViewMode);
 

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

@@ -179,6 +179,8 @@ std::variant<float, bool> CLuaCameraDefs::GetCameraFieldOfView(eFieldOfViewMode
             return g_pGame->GetSettings()->GetFieldOfViewSniperAiming();
         case FOV_MODE_1ST_PERSON_AIMING:
             return g_pGame->GetSettings()->GetFieldOfView1stPersonAiming();
+        case FOV_MODE_VEHICLE_BUMP:
+            return g_pGame->GetSettings()->GetFieldOfViewVehicleBump();
         default:
             return false;
     }
@@ -256,6 +258,8 @@ bool CLuaCameraDefs::SetCameraFieldOfView(eFieldOfViewMode mode, float fov, std:
             return g_pGame->GetSettings()->SetFieldOfViewSniperAiming(fov, true);
         case FOV_MODE_1ST_PERSON_AIMING:
             return g_pGame->GetSettings()->SetFieldOfView1stPersonAiming(fov, true);
+        case FOV_MODE_VEHICLE_BUMP:
+            return g_pGame->GetSettings()->SetFieldOfViewVehicleBump(fov, true);
     }
 
     return true;
@@ -282,6 +286,9 @@ void CLuaCameraDefs::ResetCameraFieldOfView(eFieldOfViewMode mode)
         case FOV_MODE_1ST_PERSON_AIMING:
             g_pGame->GetSettings()->ResetFieldOfView1stPersonAiming();
             break;
+        case FOV_MODE_VEHICLE_BUMP:
+            g_pGame->GetSettings()->ResetFieldOfViewVehicleBump();
+            break;
     }
 }
 

Client/sdk/game/CSettings.h

@@ -161,19 +161,22 @@ class CGameSettings
     virtual bool SetFieldOfViewAiming(float angle, bool fromScript) = 0;
     virtual bool SetFieldOfViewSniperAiming(float angle, bool fromScript) = 0;
     virtual bool SetFieldOfView1stPersonAiming(float angle, bool fromScript) = 0;
+    virtual bool SetFieldOfViewVehicleBump(float angle, bool fromScript) = 0;
 
     virtual float GetFieldOfViewPlayer() = 0;
     virtual float GetFieldOfViewVehicle() = 0;
     virtual float GetFieldOfViewVehicleMax() = 0;
     virtual float GetFieldOfViewAiming() = 0;
     virtual float GetFieldOfViewSniperAiming() = 0;
     virtual float GetFieldOfView1stPersonAiming() = 0;
+    virtual float GetFieldOfViewVehicleBump() = 0;
 
     virtual void ResetFieldOfViewPlayer() = 0;
     virtual void ResetFieldOfViewVehicle() = 0;
     virtual void ResetFieldOfViewVehicleMax() = 0;
     virtual void ResetFieldOfViewSniperAiming() = 0;
     virtual void ResetFieldOfView1stPersonAiming() = 0;
+    virtual void ResetFieldOfViewVehicleBump() = 0;
 
     virtual void SetVehiclesLODDistance(float fVehiclesLODDistance, float fTrainsPlanesLODDistance, bool bFromScript) = 0;
     virtual void ResetVehiclesLODDistance(bool bForceDefault = false) = 0;