Merge branch 'master' into cancel-command

Author: Dutchman101

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/loader/MainFunctions.cpp

@@ -863,11 +863,11 @@ void CheckDataFiles()
     {
         const char* expected;
         const char* fileName;
-    } integrityCheckList[] = {{"24F61A108D285381A67CE643ABBF589C", "bass.dll"},           {"5F9352A9D36E12E1E167E28040EADA83", "bass_aac.dll"},
-                              {"F0D770E77C5A5816D9E2323CC683BA32", "bass_ac3.dll"},       {"D6669FA6DFD548E60CC20503ABCF2FF8", "bass_fx.dll"},
-                              {"F47DCE69DAFAA06A55A4BC1F07F80C8A", "bassflac.dll"},       {"CD9B45DFE7D8B4D547F8B0193C6CF30B", "bassmidi.dll"},
-                              {"F1F587B6515530634AD489CE507BC957", "bassmix.dll"},        {"9CFA31A873FF89C2CC491B9974FC5C65", "bassopus.dll"},
-                              {"0F1B2FC6C0C703A43A24DC05352E7ADA", "basswebm.dll"},       {"1507C60C02E159B5FB247FEC6B209B09", "basswma.dll"},
+    } integrityCheckList[] = {{"DE5C08577EAA65309974F9860E303F53", "bass.dll"},           {"1D5A1AEF041255DEA49CD4780CAE4CCC", "bass_aac.dll"},
+                              {"8A1AC2AAD7F1691943635CA42F7F2940", "bass_ac3.dll"},       {"61C38C1FD091375F2A30EC631DF337E6", "bass_fx.dll"},
+                              {"F47DCE69DAFAA06A55A4BC1F07F80C8A", "bassflac.dll"},       {"49A603ED114982787FC0A301C0E93FDB", "bassmidi.dll"},
+                              {"064398B1A74B4EF35902F0C218142133", "bassmix.dll"},        {"9CFA31A873FF89C2CC491B9974FC5C65", "bassopus.dll"},
+                              {"B35714019BBFF0D0CEE0AFA2637A77A7", "basswebm.dll"},       {"1507C60C02E159B5FB247FEC6B209B09", "basswma.dll"},
                               {"C6A44FC3CF2F5801561804272217B14D", "D3DX9_42.dll"},       {"D439E8EDD8C93D7ADE9C04BCFE9197C6", "sa.dat"},
                               {"B33B21DB610116262D906305CE65C354", "D3DCompiler_42.dll"}, {"4B3932359373F11CBC542CC96D9A9285", "tags.dll"},
                               {"0B3DD892007FB366D1F52F2247C046F5", "d3dcompiler_43.dll"}, {"D5D8C8561C6DDA7EF0D7D6ABB0D772F4", "xinput1_3_mta.dll"},

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -2895,11 +2895,6 @@ void CClientPed::StreamedInPulse(bool bDoStandardPulses)
             }
         }
 
-        // Are we need to update anim speed & progress?
-        // We need to do it here because the anim starts on the next frame after calling RunNamedAnimation
-        if (m_pAnimationBlock && m_AnimationCache.progressWaitForStreamIn && IsAnimationInProgress())
-            UpdateAnimationProgressAndSpeed();
-
         // Update our alpha
         unsigned char ucAlpha = m_ucAlpha;
         // Are we in a different interior to the camera? set our alpha to 0
@@ -3690,8 +3685,8 @@ void CClientPed::_CreateModel()
             Kill(WEAPONTYPE_UNARMED, 0, false, true);
         }
 
-        // Are we still playing a animation?
-        if (m_pAnimationBlock && IsAnimationInProgress())
+        // Are we still playing animation?
+        if ((m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame || m_AnimationCache.progressWaitForStreamIn) && m_pAnimationBlock)
         {
             if (m_bisCurrentAnimationCustom)
             {
@@ -3968,8 +3963,8 @@ void CClientPed::_ChangeModel()
             }
             m_bDontChangeRadio = false;
 
-            // Are we still playing a animation?
-            if (m_pAnimationBlock && IsAnimationInProgress())
+            // Are we still playing a looped animation?
+            if ((m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame || m_AnimationCache.progressWaitForStreamIn) && m_pAnimationBlock)
             {
                 if (m_bisCurrentAnimationCustom)
                 {
@@ -5736,23 +5731,7 @@ bool CClientPed::IsRunningAnimation()
         }
         return false;
     }
-    return (m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame) && m_pAnimationBlock;
-}
-
-bool CClientPed::IsAnimationInProgress()
-{
-    bool constAnim = m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame;
-
-    if (!m_pAnimationBlock)
-        return constAnim;
-
-    float elapsedTime = static_cast<float>(GetTimestamp() - m_AnimationCache.startTime) / 1000.0f;
-
-    auto animBlendHierarchy = g_pGame->GetAnimManager()->GetAnimation(m_AnimationCache.strName.c_str(), m_pAnimationBlock);
-    if (!animBlendHierarchy)
-        return constAnim;
-
-    return constAnim || elapsedTime < animBlendHierarchy->GetTotalTime();
+    return (m_AnimationCache.bLoop && m_pAnimationBlock);
 }
 
 void CClientPed::RunNamedAnimation(std::unique_ptr<CAnimBlock>& pBlock, const char* szAnimName, int iTime, int iBlend, bool bLoop, bool bUpdatePosition,
@@ -5840,6 +5819,10 @@ void CClientPed::RunNamedAnimation(std::unique_ptr<CAnimBlock>& pBlock, const ch
     m_AnimationCache.bUpdatePosition = bUpdatePosition;
     m_AnimationCache.bInterruptable = bInterruptable;
     m_AnimationCache.bFreezeLastFrame = bFreezeLastFrame;
+    m_AnimationCache.progress = 0.0f;
+    m_AnimationCache.speed = 1.0f;
+    m_AnimationCache.progressWaitForStreamIn = false;
+    m_AnimationCache.elapsedTime = 0.0f;
 }
 
 void CClientPed::KillAnimation()
@@ -5878,45 +5861,39 @@ void CClientPed::RunAnimationFromCache()
     if (!m_pAnimationBlock)
         return;
 
+    bool  needCalcProgress = m_AnimationCache.progressWaitForStreamIn;
+    float elapsedTime = m_AnimationCache.elapsedTime;
+
     // Copy our name incase it gets deleted
     std::string animName = m_AnimationCache.strName;
 
     // Run our animation
     RunNamedAnimation(m_pAnimationBlock, animName.c_str(), m_AnimationCache.iTime, m_AnimationCache.iBlend, m_AnimationCache.bLoop, m_AnimationCache.bUpdatePosition, m_AnimationCache.bInterruptable, m_AnimationCache.bFreezeLastFrame);
 
-    // Set anim progress & speed
-    m_AnimationCache.progressWaitForStreamIn = true;
-}
-
-void CClientPed::UpdateAnimationProgressAndSpeed()
-{
-    if (!m_AnimationCache.progressWaitForStreamIn)
-        return;
-
-    // Get current anim
-    auto animAssoc = g_pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(GetClump(), m_AnimationCache.strName.c_str());
+    auto animAssoc = g_pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(GetClump(), animName.c_str());
     if (!animAssoc)
         return;
 
-    float animLength = animAssoc->GetLength();
-    float progress = 0.0f;
-    float elapsedTime = static_cast<float>(GetTimestamp() - m_AnimationCache.startTime) / 1000.0f;
-
-    if (m_AnimationCache.bFreezeLastFrame) // time and loop is ignored if freezeLastFrame is true
-        progress = (elapsedTime / animLength) * m_AnimationCache.speed;
-    else
+    // If the anim is synced from the server side, we need to calculate the progress
+    float progress = m_AnimationCache.progress;
+    if (needCalcProgress)
     {
-        if (m_AnimationCache.bLoop)
-            progress = std::fmod(elapsedTime * m_AnimationCache.speed, animLength) / animLength;
+        float animLength = animAssoc->GetLength();
+
+        if (m_AnimationCache.bFreezeLastFrame) // time and loop is ignored if freezeLastFrame is true
+            progress = (elapsedTime / animLength) * m_AnimationCache.speed;
         else
-            // For non-looped animations, limit duration to animLength if time exceeds it
-            progress = (elapsedTime / (m_AnimationCache.iTime <= animLength ? m_AnimationCache.iTime : animLength)) * m_AnimationCache.speed;
+        {
+            if (m_AnimationCache.bLoop)
+                progress = std::fmod(elapsedTime * m_AnimationCache.speed, animLength) / animLength;
+            else
+                // For non-looped animations, limit duration to animLength if time exceeds it
+                progress = (elapsedTime / (m_AnimationCache.iTime <= animLength ? m_AnimationCache.iTime : animLength)) * m_AnimationCache.speed;
+        }
     }
 
     animAssoc->SetCurrentProgress(std::clamp(progress, 0.0f, 1.0f));
     animAssoc->SetCurrentSpeed(m_AnimationCache.speed);
-
-    m_AnimationCache.progressWaitForStreamIn = false;
 }
 
 void CClientPed::PostWeaponFire()

Client/mods/deathmatch/logic/CClientPed.h

@@ -129,17 +129,17 @@ struct SReplacedAnimation
 
 struct SAnimationCache
 {
-    std::string  strName;
-    int          iTime{-1};
-    bool         bLoop{false};
-    bool         bUpdatePosition{false};
-    bool         bInterruptable{false};
-    bool         bFreezeLastFrame{true};
-    int          iBlend{250};
-    float        progress{0.0f};
-    float        speed{1.0f};
-    bool         progressWaitForStreamIn{false};
-    std::int64_t startTime{0};
+    std::string strName;
+    int         iTime{-1};
+    bool        bLoop{false};
+    bool        bUpdatePosition{false};
+    bool        bInterruptable{false};
+    bool        bFreezeLastFrame{true};
+    int         iBlend{250};
+    float       progress{0.0f};
+    float       speed{1.0f};
+    bool        progressWaitForStreamIn{false}; // for sync anim only
+    float       elapsedTime{0.0f}; // for sync anim only
 };
 
 class CClientObject;
@@ -456,18 +456,13 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
 
     bool GetRunningAnimationName(SString& strBlockName, SString& strAnimName);
     bool IsRunningAnimation();
-
-    // It checks whether the animation is still playing based on time, not on task execution.
-    bool IsAnimationInProgress();
-
     void RunNamedAnimation(std::unique_ptr<CAnimBlock>& pBlock, const char* szAnimName, int iTime = -1, int iBlend = 250, bool bLoop = true,
                            bool bUpdatePosition = true, bool bInterruptable = false, bool bFreezeLastFrame = true, bool bRunInSequence = false,
                            bool bOffsetPed = false, bool bHoldLastFrame = false);
     void KillAnimation();
     std::unique_ptr<CAnimBlock> GetAnimationBlock();
     const SAnimationCache&      GetAnimationCache() const noexcept { return m_AnimationCache; }
     void                        RunAnimationFromCache();
-    void                        UpdateAnimationProgressAndSpeed();
 
     bool IsUsingGun();
 

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -4011,8 +4011,7 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)
                             std::string blockName, animName;
                             int time, blendTime;
                             bool looped, updatePosition, interruptable, freezeLastFrame, taskRestore;
-                            float speed;
-                            double startTime;
+                            float elapsedTime, speed;
 
                             // Read data
                             bitStream.ReadString(blockName);
@@ -4024,14 +4023,15 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)
                             bitStream.ReadBit(freezeLastFrame);
                             bitStream.Read(blendTime);
                             bitStream.ReadBit(taskRestore);
-                            bitStream.Read(startTime);
+                            bitStream.Read(elapsedTime);
                             bitStream.Read(speed);
 
                             // Run anim
                             CStaticFunctionDefinitions::SetPedAnimation(*pPed, blockName, animName.c_str(), time, blendTime, looped, updatePosition, interruptable, freezeLastFrame);
-                            pPed->m_AnimationCache.startTime = static_cast<std::int64_t>(startTime);
-                            pPed->m_AnimationCache.speed = speed;
-                            pPed->m_AnimationCache.progress = 0.0f;
+                            pPed->m_AnimationCache.progressWaitForStreamIn = true;
+                            pPed->m_AnimationCache.elapsedTime = elapsedTime;
+
+                            CStaticFunctionDefinitions::SetPedAnimationSpeed(*pPed, animName, speed);
 
                             pPed->SetHasSyncedAnim(true);
                         }

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)

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);

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2247,8 +2247,6 @@ bool CStaticFunctionDefinitions::SetPedAnimation(CClientEntity& Entity, const SS
                     }
                 }
             }
-
-            Ped.m_AnimationCache.startTime = GetTimestamp();
         }
         else
         {