Merge branch 'master' into dependabot/npm_and_yarn/utils/localization/generate-images/form-data-4.0.4

Dutchman101 · web-flow · commit 60936ede9c7e · 2025-07-23T22:27:52.000Z
diff --git a/Client/game_sa/CSettingsSA.cpp b/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);
 }
diff --git a/Client/game_sa/CSettingsSA.h b/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();
diff --git a/Client/mods/deathmatch/logic/CScriptFile.cpp b/Client/mods/deathmatch/logic/CScriptFile.cpp
@@ -180,6 +180,14 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
     return m_pFile->FRead(outBuffer.data(), ulSize);
 }
 
+long CScriptFile::ReadToBuffer(unsigned char* buffer, unsigned long bufferSize)
+{
+    if (!m_pFile)
+        return -1;
+
+    return m_pFile->FRead(buffer, bufferSize);
+}
+
 long CScriptFile::Write(unsigned long ulSize, const char* pData)
 {
     if (!m_pFile)
diff --git a/Client/mods/deathmatch/logic/CScriptFile.h b/Client/mods/deathmatch/logic/CScriptFile.h
@@ -66,6 +66,7 @@ class CScriptFile final : public CClientEntity
 
     void Flush();
     long Read(unsigned long ulSize, SString& outBuffer);
+    long ReadToBuffer(unsigned char* buffer, unsigned long bufferSize);
     long Write(unsigned long ulSize, const char* pData);
 
     long GetContents(std::string& buffer);
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/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;
-}
+}
diff --git a/Client/sdk/game/CSettings.h b/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;
diff --git a/Server/mods/deathmatch/logic/CResourceChecker.Data.h b/Server/mods/deathmatch/logic/CResourceChecker.Data.h
@@ -41,6 +41,7 @@ namespace
         {"engineGetModelFlag", "1.6.0-9.21695"},
         {"engineSetModelFlag", "1.6.0-9.21695"},
         {"fileGetContents", "1.6.0-9.21938"},
+        {"fileGetHash", "1.6.0-9.23289"},
         {"engineStreamingSetModelCacheLimits", "1.6.0-9.21946"},
         {"engineStreamingRestoreBufferSize", "1.6.0-9.22195"},
         {"createBuilding", "1.6.0-9.22410"},
@@ -60,6 +61,7 @@ namespace
         {"isObjectBreakable", "1.6.0-9.21765"},
         {"setObjectBreakable", "1.6.0-9.21765"},
         {"fileGetContents", "1.6.0-9.21938"},
+        {"fileGetHash", "1.6.0-9.23289"},
         {"isWorldSpecialPropertyEnabled", "1.6.0-9.22195"},
         {"setWorldSpecialPropertyEnabled", "1.6.0-9.22195"},
         {"onResourceStateChange", "1.6.0-9.22430"},
diff --git a/Server/mods/deathmatch/logic/CScriptFile.cpp b/Server/mods/deathmatch/logic/CScriptFile.cpp
@@ -200,6 +200,14 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
     return fread(outBuffer.data(), 1, ulSize, m_pFile);
 }
 
+long CScriptFile::ReadToBuffer(unsigned char* buffer, unsigned long bufferSize)
+{
+    if (!m_pFile)
+        return -1;
+
+    return fread(buffer, 1, bufferSize, m_pFile);
+}
+
 long CScriptFile::Write(unsigned long ulSize, const char* pData)
 {
     if (!m_pFile)
diff --git a/Server/mods/deathmatch/logic/CScriptFile.h b/Server/mods/deathmatch/logic/CScriptFile.h
@@ -60,6 +60,7 @@ class CScriptFile final : public CElement
 
     void Flush();
     long Read(unsigned long ulSize, SString& outBuffer);
+    long ReadToBuffer(unsigned char* buffer, unsigned long bufferSize);
     long Write(unsigned long ulSize, const char* pData);
 
     long GetContents(std::string& buffer);
diff --git a/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot b/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-15 04:08+0000\n"
+"POT-Creation-Date: 2025-07-23 20:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -458,7 +458,7 @@ msgstr ""
 msgid "Don't show again"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:98 Client/game_sa/CSettingsSA.cpp:859
+#: Client/loader/Dialogs.cpp:98 Client/game_sa/CSettingsSA.cpp:898
 msgid "MTA: San Andreas"
 msgstr ""
 
@@ -3397,12 +3397,12 @@ msgstr ""
 msgid "Problem with graphics driver"
 msgstr ""
 
-#: Client/game_sa/CSettingsSA.cpp:781
+#: Client/game_sa/CSettingsSA.cpp:820
 msgid "Can't find valid screen resolution."
 msgstr ""
 
 #. Confirm that res should be used
-#: Client/game_sa/CSettingsSA.cpp:857
+#: Client/game_sa/CSettingsSA.cpp:896
 msgid "Are you sure you want to use this screen resolution?"
 msgstr ""
 
diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp
diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,14 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)`
`180`	`180`	`return m_pFile->FRead(outBuffer.data(), ulSize);`
`181`	`181`	`}`
`182`	`182`
	`183`	`+long CScriptFile::ReadToBuffer(unsigned char* buffer, unsigned long bufferSize)`
	`184`	`+{`
	`185`	`+ if (!m_pFile)`
	`186`	`+ return -1;`
	`187`	`+`
	`188`	`+ return m_pFile->FRead(buffer, bufferSize);`
	`189`	`+}`
	`190`	`+`
`183`	`191`	`long CScriptFile::Write(unsigned long ulSize, const char* pData)`
`184`	`192`	`{`
`185`	`193`	`if (!m_pFile)`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,14 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)`
`200`	`200`	`return fread(outBuffer.data(), 1, ulSize, m_pFile);`
`201`	`201`	`}`
`202`	`202`
	`203`	`+long CScriptFile::ReadToBuffer(unsigned char* buffer, unsigned long bufferSize)`
	`204`	`+{`
	`205`	`+ if (!m_pFile)`
	`206`	`+ return -1;`
	`207`	`+`
	`208`	`+ return fread(buffer, 1, bufferSize, m_pFile);`
	`209`	`+}`
	`210`	`+`
`203`	`211`	`long CScriptFile::Write(unsigned long ulSize, const char* pData)`
`204`	`212`	`{`
`205`	`213`	`if (!m_pFile)`