Refactor

Author: TheNormalnij

Client/game_sa/CGameSA.cpp

@@ -146,7 +146,7 @@ CGameSA::CGameSA()
         m_pCoverManager = new CCoverManagerSA();
         m_pPlantManager = new CPlantManagerSA();
         m_pBuildingRemoval = new CBuildingRemovalSA();
-        m_pVehicleAudioSettingsManager = new CVehicleAudioSettingsManagerSA();
+        m_pVehicleAudioSettingsManager = std::make_unique<CVehicleAudioSettingsManagerSA>();
 
         m_pRenderer = std::make_unique<CRendererSA>();
 
@@ -308,7 +308,6 @@ CGameSA::~CGameSA()
     delete reinterpret_cast<CAEAudioHardwareSA*>(m_pAEAudioHardware);
     delete reinterpret_cast<CAudioContainerSA*>(m_pAudioContainer);
     delete reinterpret_cast<CPointLightsSA*>(m_pPointLights);
-    delete reinterpret_cast<CVehicleAudioSettingsManagerSA*>(m_pVehicleAudioSettingsManager);
     delete static_cast<CColStoreSA*>(m_collisionStore);
     delete static_cast<CIplStore*>(m_pIplStore);
     delete static_cast<CBuildingRemovalSA*>(m_pBuildingRemoval);

Client/game_sa/CGameSA.h

@@ -18,6 +18,7 @@
 #include "CCoverManagerSA.h"
 #include "CPlantManagerSA.h"
 #include "CRendererSA.h"
+#include "CVehicleAudioSettingsManagerSA.h"
 
 class CAnimBlendClumpDataSAInterface;
 class CObjectGroupPhysicalPropertiesSA;
@@ -175,7 +176,11 @@ class CGameSA : public CGame
     CBuildingRemoval*         GetBuildingRemoval() { return m_pBuildingRemoval; }
     CRenderer*                GetRenderer() const noexcept override { return m_pRenderer.get(); }
 
-    CVehicleAudioSettingsManager*   GetVehicleAudioSettingsManager() { return m_pVehicleAudioSettingsManager; }
+    CVehicleAudioSettingsManager* GetVehicleAudioSettingsManager() const noexcept override
+    {
+        return m_pVehicleAudioSettingsManager.get();
+    }
+
     CWeaponInfo*                    GetWeaponInfo(eWeaponType weapon, eWeaponSkill skill = WEAPONSKILL_STD);
     CModelInfo*                     GetModelInfo(DWORD dwModelID, bool bCanBeInvalid = false);
     CObjectGroupPhysicalProperties* GetObjectGroupPhysicalProperties(unsigned char ucObjectGroup);
@@ -353,7 +358,8 @@ class CGameSA : public CGame
     CCoverManagerSA*                  m_pCoverManager;
     CPlantManagerSA*                  m_pPlantManager;
     CBuildingRemoval*                 m_pBuildingRemoval;
-    CVehicleAudioSettingsManager*     m_pVehicleAudioSettingsManager;
+
+    std::unique_ptr<CVehicleAudioSettingsManagerSA> m_pVehicleAudioSettingsManager;
 
     std::unique_ptr<CRendererSA>    m_pRenderer;
 

Client/game_sa/CVehicleAudioSettingsEntrySA.h

@@ -14,6 +14,7 @@
 #include "game/CVehicleAudioSettingsEntry.h"
 #include <game/Common.h>
 
+// SA interface
 struct tVehicleAudioSettings
 {
     eVehicleSoundType m_eVehicleSoundType;
@@ -40,10 +41,10 @@ class CVehicleAudioSettingsEntrySA final : public CVehicleAudioSettingsEntry
     CVehicleAudioSettingsEntrySA(tVehicleAudioSettings* pSettings) { m_Settings = *pSettings; };
     ~CVehicleAudioSettingsEntrySA() = default;
 
-    const tVehicleAudioSettings& getInterface() const noexcept { return m_Settings; };
+    const tVehicleAudioSettings& GetInterface() const noexcept { return m_Settings; };
 
     void Assign(const tVehicleAudioSettings& settings) noexcept { m_Settings = settings; }
-    void Assign(const CVehicleAudioSettingsEntry* settings) noexcept { m_Settings = static_cast<const CVehicleAudioSettingsEntrySA*>(settings)->getInterface(); };
+    void Assign(const CVehicleAudioSettingsEntry& settings) noexcept { m_Settings = static_cast<const CVehicleAudioSettingsEntrySA&>(settings).GetInterface(); };
 
     eVehicleSoundType GetSoundType() const noexcept override { return m_Settings.m_eVehicleSoundType; };
     short             GetEngineOnSoundBankID() const noexcept override { return m_Settings.m_nEngineOnSoundBankId; };

Client/game_sa/CVehicleAudioSettingsManagerSA.cpp

@@ -21,43 +21,42 @@ CVehicleAudioSettingsManagerSA::CVehicleAudioSettingsManagerSA()
     ResetAudioSettingsData();
 }
 
-CVehicleAudioSettingsEntry* CVehicleAudioSettingsManagerSA::CreateVehicleAudioSettingsData()
+std::unique_ptr<CVehicleAudioSettingsEntry> CVehicleAudioSettingsManagerSA::CreateVehicleAudioSettingsData(uint32_t modelId)
 {
-    CVehicleAudioSettingsEntrySA* pSettings = new CVehicleAudioSettingsEntrySA();
-    return pSettings;
+    auto settings = std::make_unique<CVehicleAudioSettingsEntrySA>();
+    const auto& fromSetting = GetVehicleModelAudioSettingsData(modelId);
+    settings->Assign(fromSetting);
+    return settings;
 }
 
-CVehicleAudioSettingsEntry* CVehicleAudioSettingsManagerSA::GetVehicleModelAudioSettingsData(eVehicleTypes eModel)
+CVehicleAudioSettingsEntry& CVehicleAudioSettingsManagerSA::GetVehicleModelAudioSettingsData(uint32_t modelId) noexcept
 {
-    size_t uiSettingsID = GetVehicleModelAudioSettingsID(eModel);
-    if (uiSettingsID >= VEHICLES_COUNT)
-        return nullptr;
-
-    return &m_modelEntrys[uiSettingsID];
+    return m_modelEntrys[GetVehicleModelAudioSettingsID(modelId)];
 }
 
-bool CVehicleAudioSettingsManagerSA::ApplyAudioSettingsData(eVehicleTypes eModel, CVehicleAudioSettingsEntry* pEntry)
+void CVehicleAudioSettingsManagerSA::SetNextSettings(CVehicleAudioSettingsEntry const* pSettings) noexcept
 {
-    size_t uiSettingsID = GetVehicleModelAudioSettingsID(eModel);
-    if (uiSettingsID >= VEHICLES_COUNT)
-        return false;
+    pNextVehicleAudioSettings = &static_cast<CVehicleAudioSettingsEntrySA const*>(pSettings)->GetInterface();
+}
 
-    m_modelEntrys[uiSettingsID].Assign(pEntry);
-    return true;
+void CVehicleAudioSettingsManagerSA::SetNextSettings(uint32_t modelId) noexcept
+{
+    pNextVehicleAudioSettings = &m_modelEntrys[GetVehicleModelAudioSettingsID(modelId)].GetInterface();
 }
 
-void CVehicleAudioSettingsManagerSA::SetNextSettings(CVehicleAudioSettingsEntry* pSettings)
+void CVehicleAudioSettingsManagerSA::ResetModelSettings(uint32_t modelId) noexcept
 {
-    pNextVehicleAudioSettings = &static_cast<CVehicleAudioSettingsEntrySA*>(pSettings)->getInterface();
+    size_t index = GetVehicleModelAudioSettingsID(modelId);
+    m_modelEntrys[index].Assign(ORIGINAL_AUDIO_SETTINGS[index]);
 }
 
-void CVehicleAudioSettingsManagerSA::ResetAudioSettingsData()
+void CVehicleAudioSettingsManagerSA::ResetAudioSettingsData() noexcept
 {
     for (size_t i = 0; i < VEHICLES_COUNT; i++)
         m_modelEntrys[i].Assign(ORIGINAL_AUDIO_SETTINGS[i]);
 }
 
-void CVehicleAudioSettingsManagerSA::StaticSetHooks()
+void CVehicleAudioSettingsManagerSA::StaticSetHooks() noexcept
 {
     // Replace 
     // 8D 34 B5 F0 0A 86 00 ; lea esi, _VehicleAudioProperties.m_eVehicleSoundType[esi*4]

Client/game_sa/CVehicleAudioSettingsManagerSA.h

@@ -12,6 +12,7 @@
 #pragma once
 
 #include <game/CVehicleAudioSettingsManager.h>
+#include "CVehicleAudioSettingsEntrySA.h"
 #include "CAEVehicleAudioEntitySA.h"
 #include <array>
 
@@ -22,17 +23,19 @@ class CVehicleAudioSettingsManagerSA final : public CVehicleAudioSettingsManager
 public:
     CVehicleAudioSettingsManagerSA();
 
-    CVehicleAudioSettingsEntry* CreateVehicleAudioSettingsData();
-    CVehicleAudioSettingsEntry* GetVehicleModelAudioSettingsData(eVehicleTypes eModel);
+    std::unique_ptr<CVehicleAudioSettingsEntry> CreateVehicleAudioSettingsData(uint32_t modelId) override;
+    CVehicleAudioSettingsEntry& GetVehicleModelAudioSettingsData(uint32_t modelId) noexcept override;
 
-    bool ApplyAudioSettingsData(eVehicleTypes eModel, CVehicleAudioSettingsEntry* pEntry);
-    void SetNextSettings(CVehicleAudioSettingsEntry* pSettings);
+    void ResetModelSettings(uint32_t modelId) noexcept override;
+    void ResetAudioSettingsData() noexcept;
 
-    static void StaticSetHooks();
+    void SetNextSettings(CVehicleAudioSettingsEntry const* pSettings) noexcept override;
+    void SetNextSettings(uint32_t modelId) noexcept override;
+
+    static void StaticSetHooks() noexcept;
 
 private:
-    void   ResetAudioSettingsData();
-    size_t GetVehicleModelAudioSettingsID(eVehicleTypes eModel) const noexcept { return eModel - 400; };
+    size_t GetVehicleModelAudioSettingsID(uint32_t modelId) const noexcept { return modelId - 400; };
 
 private:
     // Array with the model audio settings entries

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -82,10 +82,6 @@ CClientVehicle::CClientVehicle(CClientManager* pManager, ElementID ID, unsigned
         m_BikeHandlingEntry->Assign(m_pOriginalBikeHandlingEntry);
     }
 
-    m_pOriginalSoundSettingsEntry = g_pGame->GetVehicleAudioSettingsManager()->GetVehicleModelAudioSettingsData(static_cast<eVehicleTypes>(m_usModel));
-    m_pSoundSettingsEntry = g_pGame->GetVehicleAudioSettingsManager()->CreateVehicleAudioSettingsData();
-    m_pSoundSettingsEntry->Assign(m_pOriginalSoundSettingsEntry);
-
     SetTypeName("vehicle");
 
     m_ucMaxPassengers = CClientVehicleManager::GetMaxPassengerCount(usModel);
@@ -214,6 +210,8 @@ CClientVehicle::CClientVehicle(CClientManager* pManager, ElementID ID, unsigned
     // We've not changed the wheel scale
     m_bWheelScaleChanged = false;
     m_clientModel = pManager->GetModelManager()->FindModelByID(usModel);
+
+    m_pSoundSettingsEntry = nullptr;
 }
 
 CClientVehicle::~CClientVehicle()
@@ -2495,7 +2493,16 @@ void CClientVehicle::Create()
             m_pModelInfo->SetCustomCarPlateText(m_strRegPlate.c_str());
 
         // Prepare audio settings
-        g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(m_pSoundSettingsEntry);
+        if (m_pSoundSettingsEntry)
+            g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(m_pSoundSettingsEntry.get());
+        else
+        {
+            uint32_t modelId = m_usModel;
+            if (!CClientVehicleManager::IsStandardModel(modelId))
+                modelId = g_pGame->GetModelInfo(m_usModel)->GetParentID();
+
+            g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(m_usModel);
+        }
 
         // Create the vehicle
         if (CClientVehicleManager::IsTrainModel(m_usModel))
@@ -4911,6 +4918,23 @@ bool CClientVehicle::OnVehicleFallThroughMap()
     return false;
 }
 
+const CVehicleAudioSettingsEntry& CClientVehicle::GetAudioSettings() const noexcept
+{
+    if (m_pSoundSettingsEntry)
+        return *m_pSoundSettingsEntry.get();
+    else
+        return g_pGame->GetVehicleAudioSettingsManager()->GetVehicleModelAudioSettingsData(m_usModel);
+}
+
+CVehicleAudioSettingsEntry& CClientVehicle::GetOrCreateAudioSettings()
+{
+    if (!m_pSoundSettingsEntry)
+        m_pSoundSettingsEntry = g_pGame->GetVehicleAudioSettingsManager()->CreateVehicleAudioSettingsData(m_usModel);
+
+    return *m_pSoundSettingsEntry.get();
+}
+
+
 bool CClientVehicle::GetDummyPosition(eVehicleDummies dummy, CVector& position) const
 {
     if (dummy >= 0 && dummy < VEHICLE_DUMMY_COUNT)
@@ -5082,10 +5106,16 @@ CVector CClientVehicle::GetEntryPoint(std::uint32_t entryPointIndex)
 
 void CClientVehicle::ApplyAudioSettings()
 {
-    if (m_pVehicle)
-    {
-        g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(GetAudioSettings());
-        m_pVehicle->ReinitAudio();
-    }
+    if (!m_pVehicle)
+        return;
+
+    g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(&GetAudioSettings());
+    m_pVehicle->ReinitAudio();
+}
+
+void CClientVehicle::ResetAudioSettings()
+{
+    m_pSoundSettingsEntry = nullptr;
+    ApplyAudioSettings();
 }
 

Client/mods/deathmatch/logic/CClientVehicle.h

@@ -541,9 +541,11 @@ class CClientVehicle : public CClientStreamElement
     void  ResetWheelScale();
 
     bool OnVehicleFallThroughMap();
-    CVehicleAudioSettingsEntry* GetAudioSettings() { return m_pSoundSettingsEntry; };
+    const CVehicleAudioSettingsEntry& GetAudioSettings() const noexcept;
+    CVehicleAudioSettingsEntry&       GetOrCreateAudioSettings();
 
     void ApplyAudioSettings();
+    void ResetAudioSettings();
 
     bool GetDummyPosition(eVehicleDummies dummy, CVector& position) const;
     bool SetDummyPosition(eVehicleDummies dummy, const CVector& position);
@@ -672,8 +674,7 @@ class CClientVehicle : public CClientStreamElement
     float                                  m_fNitroLevel;
     char                                   m_cNitroCount;
     float                                  m_fWheelScale;
-    const CVehicleAudioSettingsEntry*      m_pOriginalSoundSettingsEntry;
-    CVehicleAudioSettingsEntry*            m_pSoundSettingsEntry;
+    std::unique_ptr<CVehicleAudioSettingsEntry> m_pSoundSettingsEntry;
 
     bool  m_bChainEngine;
     bool  m_bIsDerailed;

Client/mods/deathmatch/logic/CClientVehicleManager.cpp

@@ -432,14 +432,6 @@ bool CClientVehicleManager::IsStandardModel(unsigned long ulModel)
     return ulModel >= 400 && ulModel <= 611;
 }
 
-unsigned long CClientVehicleManager::GetRootModelId(unsigned long ulModel)
-{
-    if (IsStandardModel(ulModel))
-        return ulModel;
-
-    return g_pGame->GetModelInfo(ulModel)->GetParentID();
-}
-
 eClientVehicleType CClientVehicleManager::GetVehicleType(unsigned long ulModel)
 {
     // Valid vehicle id?

Client/mods/deathmatch/logic/CClientVehicleManager.h

@@ -35,7 +35,6 @@ class CClientVehicleManager
     static bool               IsTrainModel(unsigned long ulModel);
     static bool               IsValidModel(unsigned long ulModel);
     static bool               IsStandardModel(unsigned long ulModel);
-    static unsigned long      GetRootModelId(unsigned long ulModel);
     static eClientVehicleType GetVehicleType(unsigned long ulModel);
     static unsigned char      GetMaxPassengerCount(unsigned long ulModel);
     static unsigned char      ConvertIndexToGameSeat(unsigned long ulModel, unsigned char ucIndex);