Merge branch 'refactor-play-sound' of github.com:Pirulax/gta-reversed into refactor-play-sound

Author: Pirulax

source/game_sa/3dMarkers.cpp

@@ -3,6 +3,9 @@
 #include "3dMarkers.h"
 #include "PostEffects.h"
 
+// RwIm3DVertex StreakVertices[4];
+RxObjSpace3DVertex* aRenderVertices = (RxObjSpace3DVertex*)0xC278F8;
+
 void C3dMarkers::InjectHooks() {
     RH_ScopedClass(C3dMarkers);
     RH_ScopedCategoryGlobal();

source/game_sa/Audio/entities/AEVehicleAudioEntity.cpp

@@ -3702,7 +3702,7 @@ void CAEVehicleAudioEntity::ProcessPlayerSeaPlane(tVehicleParams& vp) {
     // 0x4FF5F1
     CalculatePlanePropFreq(vp, GetAircraftAcceleration(vp));
 
-    const auto propSpeed    = veh->m_fPropSpeed / 0.22f;
+    const auto propSpeed    = veh->m_EngineSpeed / 0.22f;
     const auto camPoVFactor = GetAircraftCameraPoVFactor(veh);
     const auto sf           = GetDummyRCRotorSpeedFactor(propSpeed);
     PlayAircraftSound( // 0x4FF74A
@@ -4137,14 +4137,14 @@ void CAEVehicleAudioEntity::ProcessBoatEngine(tVehicleParams& vp) {
     }
 
     // Engine speed factor
-    const auto es = std::clamp(boat->m_fPropSpeed * 3.f, 0.f, 1.f);
+    const auto es = std::clamp(boat->m_EngineSpeed * 3.f, 0.f, 1.f);
 
     // 0x5004C7 - Calculate speed
     {
         const auto roll  = std::min(1.f, 1.f - boat->GetUp().Dot(CVector::ZAxisVector()));
         const auto speed = cfg->FrqEngineBase
             + roll * cfg->FrqEngineRollFactor
-            + es * (boat->m_nBoatFlags.bOnWater ? cfg->FrqEngineOnWaterFactor : cfg->FrqEngineInAirFactor);
+            + es * (boat->m_nBoatFlags.bBoatInWater ? cfg->FrqEngineOnWaterFactor : cfg->FrqEngineInAirFactor);
         m_CurrentDummyEngineFrequency = m_CurrentDummyEngineFrequency >= 0.f
             ? notsa::step_to(m_CurrentDummyEngineFrequency, speed, 0.02f, notsa::bugfixes::GenericFrameRate)
             : speed;
@@ -4176,7 +4176,7 @@ void CAEVehicleAudioEntity::ProcessBoatMovingOverWater(tVehicleParams& vp) {
 
     const auto sf = std::min(0.75f, std::abs(vp.Speed)) / 0.75f;
 
-    auto volume = boat->m_nBoatFlags.bOnWater && sf >= 0.00001f
+    auto volume = boat->m_nBoatFlags.bBoatInWater && sf >= 0.00001f
         ? (m_AuSettings.IsSeaplane() ? cfg->VolBaseOfSeaplane : cfg->VolBase) + CAEAudioUtility::AudioLog10(sf) * 20.f
         : -100.f;
     auto speed = cfg->FrqBase + cfg->FrqSpeedFactor * sf;

source/game_sa/Camera.cpp

@@ -145,7 +145,7 @@ void CCamera::InjectHooks() {
     RH_ScopedOverloadedInstall(ProcessVectorMoveLinear, "0", 0x50D430, void(CCamera::*)(float), { .reversed = false });
     RH_ScopedOverloadedInstall(ProcessVectorMoveLinear, "1", 0x5164A0, void(CCamera::*)(), { .reversed = false });
     RH_ScopedOverloadedInstall(ProcessFOVLerp, "0", 0x50D510, void(CCamera::*)(float), { .reversed = false });
-    RH_ScopedOverloadedInstall(ProcessFOVLerp, "1", 0x516500, void(CCamera::*)(), { .reversed = false });
+    RH_ScopedOverloadedInstall(ProcessFOVLerp, "1", 0x516500, void(CCamera::*)());
     //RH_ScopedOverloadedInstall(ProcessJiggle, "0", 0x516560, { .reversed = false });
 
     RH_ScopedGlobalInstall(CamShakeNoPos, 0x50A970);
@@ -1465,7 +1465,11 @@ void CCamera::ProcessVectorMoveLinear(float ratio) {
 
 // 0x516500
 void CCamera::ProcessFOVLerp() {
-    plugin::CallMethod<0x516500, CCamera*>(this);
+    if (const auto now = static_cast<float>(CTimer::GetTimeInMS()); now <= m_fEndZoomTime) { /* Check if still processing */
+        ProcessFOVLerp(invLerp(m_fStartZoomTime, m_fEndZoomTime, now));
+    } else if (m_bBlockZoom) { /* Finished */
+        m_bFOVLerpProcessed = true;
+    }
 }
 
 // 0x50D510

source/game_sa/Entity/Vehicle/Automobile.cpp

@@ -2142,7 +2142,7 @@ void CAutomobile::GetComponentWorldPosition(int32 componentId, CVector& outPos)
 }
 
 // 0x6A2250
-bool CAutomobile::IsComponentPresent(int32 componentId)
+bool CAutomobile::IsComponentPresent(int32 componentId) const
 {
     return m_aCarNodes[componentId] != 0;
 }

source/game_sa/Entity/Vehicle/Automobile.h

@@ -150,7 +150,7 @@ class NOTSA_EXPORT_VTABLE CAutomobile : public CVehicle {
     void ProcessControlCollisionCheck(bool applySpeed) override;
     void ProcessControlInputs(uint8 playerNum) override;
     void GetComponentWorldPosition(int32 componentId, CVector& outPos) override;
-    bool IsComponentPresent(int32 componentId) override;
+    bool IsComponentPresent(int32 componentId) const override;
     void OpenDoor(CPed* ped, int32 componentId, eDoors door, float doorOpenRatio, bool playSound) override; // eCarNodes = componentId
 
     //!!!!!!!!!!!!!!!!!!!

source/game_sa/Entity/Vehicle/Bike.h

@@ -125,12 +125,12 @@ class NOTSA_EXPORT_VTABLE CBike : public CVehicle {
     bool IsDoorClosedU32(uint32 door) override { return false; }    // 0x6B5940
     bool IsDoorMissingU32(uint32 door) override { return true; }    // 0x6B5950
 
-    bool IsRoomForPedToLeaveCar(uint32 door, CVector* pvecCarJackOffset) override { return true; }              // 0x6B7270
-    inline bool IsComponentPresent(int32 componentId) override { return m_aBikeNodes[componentId] != nullptr; } // 0x6B59E0
-    CRideAnimData* GetRideAnimData() override { return &m_RideAnimData; }                                       // 0x6B58C0
-    float GetHeightAboveRoad() override { return m_fHeightAboveRoad; }                                          // 0x6B58B0
-    int32 GetNumContactWheels() override { return m_nNoOfContactWheels; }                                       // 0x6B58A0
-    float FindWheelWidth(bool bRear) override { return 0.15f; }                                                 // 0x6B8940
+    bool IsRoomForPedToLeaveCar(uint32 door, CVector* pvecCarJackOffset) override { return true; }                    // 0x6B7270
+    inline bool IsComponentPresent(int32 componentId) const override { return m_aBikeNodes[componentId] != nullptr; } // 0x6B59E0
+    CRideAnimData* GetRideAnimData() override { return &m_RideAnimData; }                                             // 0x6B58C0
+    float GetHeightAboveRoad() override { return m_fHeightAboveRoad; }                                                // 0x6B58B0
+    int32 GetNumContactWheels() override { return m_nNoOfContactWheels; }                                             // 0x6B58A0
+    float FindWheelWidth(bool bRear) override { return 0.15f; }                                                       // 0x6B8940
 
     virtual bool ProcessAI(uint32& extraHandlingFlags);