std::shared_ptr from CHandlingManagerSA

Author: G_Moris

Client/game_sa/CGameSA.cpp

@@ -125,7 +125,7 @@ CGameSA::CGameSA()
     m_pControllerConfigManager = new CControllerConfigManagerSA();
     m_pProjectileInfo = new CProjectileInfoSA();
     m_pRenderWare = new CRenderWareSA();
-    m_pHandlingManager = new CHandlingManagerSA();
+    m_HandlingManager = std::make_shared<CHandlingManagerSA>();
     m_pEventList = new CEventListSA();
     m_pGarages = new CGaragesSA((CGaragesSAInterface*)CLASS_CGarages);
     m_pTasks = new CTasksSA((CTaskManagementSystemSA*)m_pTaskManagementSystem);
@@ -261,7 +261,6 @@ CGameSA::~CGameSA()
     delete reinterpret_cast<CAnimManagerSA*>(m_pAnimManager);
     delete reinterpret_cast<CTasksSA*>(m_pTasks);
     delete reinterpret_cast<CTaskManagementSystemSA*>(m_pTaskManagementSystem);
-    delete reinterpret_cast<CHandlingManagerSA*>(m_pHandlingManager);
     delete reinterpret_cast<CStatsSA*>(m_pStats);
     delete reinterpret_cast<CWeatherSA*>(m_pWeather);
     delete reinterpret_cast<CAERadioTrackManagerSA*>(m_pCAERadioTrackManager);

Client/game_sa/CGameSA.h

@@ -155,7 +155,7 @@ class CGameSA : public CGame
     CCarEnterExit*            GetCarEnterExit() { return m_pCarEnterExit; }
     CControllerConfigManager* GetControllerConfigManager() { return m_pControllerConfigManager; }
     CRenderWare*              GetRenderWare() { return m_pRenderWare; }
-    CHandlingManager*         GetHandlingManager() { return m_pHandlingManager; }
+    std::shared_ptr<CHandlingManager> GetHandlingManager() const noexcept { return m_HandlingManager; }
     CAnimManager*             GetAnimManager() { return m_pAnimManager; }
     CStreaming*               GetStreaming() { return m_pStreaming; }
     CVisibilityPlugins*       GetVisibilityPlugins() { return m_pVisibilityPlugins; }
@@ -331,7 +331,7 @@ class CGameSA : public CGame
     CExplosionManager*              m_pExplosionManager;
     C3DMarkers*                     m_p3DMarkers;
     CRenderWareSA*                  m_pRenderWare;
-    CHandlingManager*               m_pHandlingManager;
+    std::shared_ptr<CHandlingManager> m_HandlingManager;
     CAnimManager*                   m_pAnimManager;
     CStreaming*                     m_pStreaming;
     CVisibilityPlugins*             m_pVisibilityPlugins;

Client/sdk/game/CGame.h

@@ -137,7 +137,7 @@ class __declspec(novtable) CGame
     virtual CCarEnterExit*            GetCarEnterExit() = 0;
     virtual CControllerConfigManager* GetControllerConfigManager() = 0;
     virtual CRenderWare*              GetRenderWare() = 0;
-    virtual CHandlingManager*         GetHandlingManager() = 0;
+    virtual std::shared_ptr<CHandlingManager> GetHandlingManager() const noexcept = 0;
     virtual CAnimManager*             GetAnimManager() = 0;
     virtual CStreaming*               GetStreaming() = 0;
     virtual CVisibilityPlugins*       GetVisibilityPlugins() = 0;