Update 4

Author: G_Moris

Client/game_sa/CHandlingEntrySA.cpp

@@ -19,8 +19,7 @@ extern CGameSA* pGame;
 CHandlingEntrySA::CHandlingEntrySA()
 {
     // Create a new interface and zero it
-    m_HandlingSA = std::make_unique<tHandlingDataSA>();
-    if (m_HandlingSA)
+    if (m_HandlingSA = std::make_unique<tHandlingDataSA>())
     {
         memset(m_HandlingSA.get(), 0, sizeof(tHandlingDataSA));
     }

Server/mods/deathmatch/logic/CGame.cpp

@@ -166,7 +166,7 @@ CGame::CGame() : m_FloodProtect(4, 30000, 30000)            // Max of 4 connecti
     m_pUnoccupiedVehicleSync = NULL;
     m_pConsole = NULL;
     m_pMapManager = NULL;
-    m_pHandlingManager = NULL;
+    m_HandlingManager = nullptr;
     m_pLuaManager = NULL;
     m_pPacketTranslator = NULL;
     m_pMarkerManager = NULL;
@@ -343,9 +343,12 @@ CGame::~CGame()
     CSimControl::EnableSimSystem(false);
 
     // Disconnect all players
-    std::list<CPlayer*>::const_iterator iter = m_pPlayerManager->IterBegin();
-    for (; iter != m_pPlayerManager->IterEnd(); iter++)
-        DisconnectPlayer(this, **iter, CPlayerDisconnectedPacket::SHUTDOWN);
+    if (m_pPlayerManager)
+    {
+        std::list<CPlayer*>::const_iterator iter = m_pPlayerManager->IterBegin();
+        for (; iter != m_pPlayerManager->IterEnd(); iter++)
+            DisconnectPlayer(this, **iter, CPlayerDisconnectedPacket::SHUTDOWN);
+    }
 
     // Stop networking
     Stop();
@@ -372,7 +375,6 @@ CGame::~CGame()
     SAFE_DELETE(m_pRadarAreaManager);
     SAFE_DELETE(m_pPlayerManager);
     SAFE_DELETE(m_pVehicleManager);
-    SAFE_DELETE(m_pHandlingManager);
     SAFE_DELETE(m_pPickupManager);
     SAFE_DELETE(m_pObjectManager);
     SAFE_DELETE(m_pColManager);
@@ -579,43 +581,57 @@ bool CGame::Start(int iArgumentCount, char* szArguments[])
     CElement::StartupEntitiesFromRoot();
 
     CSimControl::Startup();
-    m_pGroups = new CGroups;
-    m_pClock = new CClock;
-    m_pBlipManager = new CBlipManager;
-    m_pColManager = new CColManager;
-    m_pObjectManager = new CObjectManager;
-    m_pPickupManager = new CPickupManager(m_pColManager);
-    m_pPlayerManager = new CPlayerManager;
-    m_pRadarAreaManager = new CRadarAreaManager;
-    m_pMarkerManager = new CMarkerManager(m_pColManager);
-    m_pHandlingManager = new CHandlingManager;
-    m_pVehicleManager = new CVehicleManager;
-    m_pPacketTranslator = new CPacketTranslator(m_pPlayerManager);
-    m_pBanManager = new CBanManager;
-    m_pTeamManager = new CTeamManager;
-    m_pPedManager = new CPedManager;
-    m_pWaterManager = new CWaterManager;
-    m_pScriptDebugging = new CScriptDebugging();
-    m_pMapManager =
-        new CMapManager(m_pBlipManager, m_pObjectManager, m_pPickupManager, m_pPlayerManager, m_pRadarAreaManager, m_pMarkerManager, m_pVehicleManager,
-                        m_pTeamManager, m_pPedManager, m_pColManager, m_pWaterManager, m_pClock, m_pGroups, &m_Events, m_pScriptDebugging, &m_ElementDeleter);
-    m_pACLManager = new CAccessControlListManager;
-    m_pHqComms = new CHqComms;
-
-    m_pRegisteredCommands = new CRegisteredCommands(m_pACLManager);
-    m_pLuaManager = new CLuaManager(m_pObjectManager, m_pPlayerManager, m_pVehicleManager, m_pBlipManager, m_pRadarAreaManager, m_pRegisteredCommands,
-                                    m_pMapManager, &m_Events);
-    m_pConsole = new CConsole(m_pBlipManager, m_pMapManager, m_pPlayerManager, m_pRegisteredCommands, m_pVehicleManager, m_pBanManager, m_pACLManager);
-    m_pMainConfig = new CMainConfig(m_pConsole);
-    m_pRPCFunctions = new CRPCFunctions;
-
-    m_pWeaponStatsManager = new CWeaponStatManager();
-
-    m_pBuildingRemovalManager = new CBuildingRemovalManager;
-
-    m_pCustomWeaponManager = new CCustomWeaponManager();
-
-    m_pTrainTrackManager = std::make_shared<CTrainTrackManager>();
+
+    try
+    {
+        m_pGroups = new CGroups;
+        m_pClock = new CClock;
+        m_pBlipManager = new CBlipManager;
+        m_pColManager = new CColManager;
+        m_pObjectManager = new CObjectManager;
+        m_pPickupManager = new CPickupManager(m_pColManager);
+        m_pPlayerManager = new CPlayerManager;
+        m_pRadarAreaManager = new CRadarAreaManager;
+        m_pMarkerManager = new CMarkerManager(m_pColManager);
+        m_HandlingManager = std::make_shared<CHandlingManager>();
+        m_pVehicleManager = new CVehicleManager;
+        m_pPacketTranslator = new CPacketTranslator(m_pPlayerManager);
+        m_pBanManager = new CBanManager;
+        m_pTeamManager = new CTeamManager;
+        m_pPedManager = new CPedManager;
+        m_pWaterManager = new CWaterManager;
+        m_pScriptDebugging = new CScriptDebugging();
+        m_pMapManager = new CMapManager(m_pBlipManager, m_pObjectManager, m_pPickupManager, m_pPlayerManager, m_pRadarAreaManager, m_pMarkerManager,
+                                        m_pVehicleManager, m_pTeamManager, m_pPedManager, m_pColManager, m_pWaterManager, m_pClock, m_pGroups, &m_Events,
+                                        m_pScriptDebugging, &m_ElementDeleter);
+        m_pACLManager = new CAccessControlListManager;
+        m_pHqComms = new CHqComms;
+
+        m_pRegisteredCommands = new CRegisteredCommands(m_pACLManager);
+        m_pLuaManager = new CLuaManager(m_pObjectManager, m_pPlayerManager, m_pVehicleManager, m_pBlipManager, m_pRadarAreaManager, m_pRegisteredCommands,
+                                        m_pMapManager, &m_Events);
+        m_pConsole = new CConsole(m_pBlipManager, m_pMapManager, m_pPlayerManager, m_pRegisteredCommands, m_pVehicleManager, m_pBanManager, m_pACLManager);
+        m_pMainConfig = new CMainConfig(m_pConsole);
+        m_pRPCFunctions = new CRPCFunctions;
+
+        m_pWeaponStatsManager = new CWeaponStatManager();
+
+        m_pBuildingRemovalManager = new CBuildingRemovalManager;
+
+        m_pCustomWeaponManager = new CCustomWeaponManager();
+
+        m_pTrainTrackManager = std::make_shared<CTrainTrackManager>();
+    }
+    catch (const std::bad_alloc& e)
+    {
+        std::cout << "ERROR: Memory allocations failed: " << e.what() << std::endl;
+        return false;
+    }
+    catch (const std::exception& e)
+    {
+        std::cout << "ERROR: Constructors failed: " << e.what() << std::endl;
+        return false;
+    }
 
     // Parse the commandline
     if (!m_CommandLineParser.Parse(iArgumentCount, szArguments))

Server/mods/deathmatch/logic/CGame.h

@@ -215,55 +215,54 @@ class CGame
     void SetIsFinished(bool bFinished) { m_bIsFinished = bFinished; };
     bool IsFinished() { return m_bIsFinished; };
 
-    CMainConfig*            GetConfig() { return m_pMainConfig; }
-    CHandlingManager*       GetHandlingManager() { return m_pHandlingManager; }
-    CMapManager*            GetMapManager() { return m_pMapManager; }
-    CPlayerManager*         GetPlayerManager() { return m_pPlayerManager; }
-    CObjectManager*         GetObjectManager() { return m_pObjectManager; }
-    CVehicleManager*        GetVehicleManager() { return m_pVehicleManager; }
-    CTeamManager*           GetTeamManager() { return m_pTeamManager; }
-    CUnoccupiedVehicleSync* GetUnoccupiedVehicleSync() { return m_pUnoccupiedVehicleSync; }
-    CPedSync*               GetPedSync() { return m_pPedSync; }
-    CRegisteredCommands*    GetRegisteredCommands() { return m_pRegisteredCommands; }
+    CMainConfig*                        GetConfig() { return m_pMainConfig; }
+    std::shared_ptr<CHandlingManager>   GetHandlingManager() { return m_HandlingManager; }
+    CMapManager*                        GetMapManager() { return m_pMapManager; }
+    CPlayerManager*                     GetPlayerManager() { return m_pPlayerManager; }
+    CObjectManager*                     GetObjectManager() { return m_pObjectManager; }
+    CVehicleManager*                    GetVehicleManager() { return m_pVehicleManager; }
+    CTeamManager*                       GetTeamManager() { return m_pTeamManager; }
+    CUnoccupiedVehicleSync*             GetUnoccupiedVehicleSync() { return m_pUnoccupiedVehicleSync; }
+    CPedSync*                           GetPedSync() { return m_pPedSync; }
+    CRegisteredCommands*                GetRegisteredCommands() { return m_pRegisteredCommands; }
 #ifdef WITH_OBJECT_SYNC
-    CObjectSync* GetObjectSync() { return m_pObjectSync; }
+    CObjectSync*                        GetObjectSync() { return m_pObjectSync; }
 #endif
-    CConsole*                        GetConsole() { return m_pConsole; }
-    CDatabaseManager*                GetDatabaseManager() { return m_pDatabaseManager; }
-    CLuaCallbackManager*             GetLuaCallbackManager() { return m_pLuaCallbackManager; }
-    CRegistryManager*                GetRegistryManager() { return m_pRegistryManager; }
-    CRegistry*                       GetRegistry() { return m_pRegistry; }
-    CAccountManager*                 GetAccountManager() { return m_pAccountManager; }
-    CScriptDebugging*                GetScriptDebugging() { return m_pScriptDebugging; }
-    CEvents*                         GetEvents() { return &m_Events; }
-    CColManager*                     GetColManager() { return m_pColManager; }
-    CLatentTransferManager*          GetLatentTransferManager() { return m_pLatentTransferManager; }
-    CDebugHookManager*               GetDebugHookManager() { return m_pDebugHookManager; }
-    CPedManager*                     GetPedManager() { return m_pPedManager; }
-    CResourceManager*                GetResourceManager() { return m_pResourceManager; }
-    CMarkerManager*                  GetMarkerManager() { return m_pMarkerManager; }
-    CBlipManager*                    GetBlipManager() { return m_pBlipManager; }
-    CPickupManager*                  GetPickupManager() { return m_pPickupManager; }
-    CRadarAreaManager*               GetRadarAreaManager() { return m_pRadarAreaManager; }
-    CGroups*                         GetGroups() { return m_pGroups; }
-    CElementDeleter*                 GetElementDeleter() { return &m_ElementDeleter; }
-    CConnectHistory*                 GetJoinFloodProtector() { return &m_FloodProtect; }
-    CHTTPD*                          GetHTTPD() { return m_pHTTPD; }
-    CSettings*                       GetSettings() { return m_pSettings; }
-    CAccessControlListManager*       GetACLManager() { return m_pACLManager; }
-    CBanManager*                     GetBanManager() { return m_pBanManager; }
-    CRemoteCalls*                    GetRemoteCalls() { return m_pRemoteCalls; }
-    CZoneNames*                      GetZoneNames() { return m_pZoneNames; }
-    CClock*                          GetClock() { return m_pClock; }
-    CWaterManager*                   GetWaterManager() { return m_pWaterManager; }
-    CLightsyncManager*               GetLightSyncManager() { return &m_lightsyncManager; }
-    CWeaponStatManager*              GetWeaponStatManager() { return m_pWeaponStatsManager; }
-    CBuildingRemovalManager*         GetBuildingRemovalManager() { return m_pBuildingRemovalManager; }
-    CCustomWeaponManager*            GetCustomWeaponManager() { return m_pCustomWeaponManager; }
-    CFunctionUseLogger*              GetFunctionUseLogger() { return m_pFunctionUseLogger; }
-    CMasterServerAnnouncer*          GetMasterServerAnnouncer() { return m_pMasterServerAnnouncer; }
-    SharedUtil::CAsyncTaskScheduler* GetAsyncTaskScheduler() { return m_pAsyncTaskScheduler; }
-
+    CConsole*                           GetConsole() { return m_pConsole; }
+    CDatabaseManager*                   GetDatabaseManager() { return m_pDatabaseManager; }
+    CLuaCallbackManager*                GetLuaCallbackManager() { return m_pLuaCallbackManager; }
+    CRegistryManager*                   GetRegistryManager() { return m_pRegistryManager; }
+    CRegistry*                          GetRegistry() { return m_pRegistry; }
+    CAccountManager*                    GetAccountManager() { return m_pAccountManager; }
+    CScriptDebugging*                   GetScriptDebugging() { return m_pScriptDebugging; }
+    CEvents*                            GetEvents() { return &m_Events; }
+    CColManager*                        GetColManager() { return m_pColManager; }
+    CLatentTransferManager*             GetLatentTransferManager() { return m_pLatentTransferManager; }
+    CDebugHookManager*                  GetDebugHookManager() { return m_pDebugHookManager; }
+    CPedManager*                        GetPedManager() { return m_pPedManager; }
+    CResourceManager*                   GetResourceManager() { return m_pResourceManager; }
+    CMarkerManager*                     GetMarkerManager() { return m_pMarkerManager; }
+    CBlipManager*                       GetBlipManager() { return m_pBlipManager; }
+    CPickupManager*                     GetPickupManager() { return m_pPickupManager; }
+    CRadarAreaManager*                  GetRadarAreaManager() { return m_pRadarAreaManager; }
+    CGroups*                            GetGroups() { return m_pGroups; }
+    CElementDeleter*                    GetElementDeleter() { return &m_ElementDeleter; }
+    CConnectHistory*                    GetJoinFloodProtector() { return &m_FloodProtect; }
+    CHTTPD*                             GetHTTPD() { return m_pHTTPD; }
+    CSettings*                          GetSettings() { return m_pSettings; }
+    CAccessControlListManager*          GetACLManager() { return m_pACLManager; }
+    CBanManager*                        GetBanManager() { return m_pBanManager; }
+    CRemoteCalls*                       GetRemoteCalls() { return m_pRemoteCalls; }
+    CZoneNames*                         GetZoneNames() { return m_pZoneNames; }
+    CClock*                             GetClock() { return m_pClock; }
+    CWaterManager*                      GetWaterManager() { return m_pWaterManager; }
+    CLightsyncManager*                  GetLightSyncManager() { return &m_lightsyncManager; }
+    CWeaponStatManager*                 GetWeaponStatManager() { return m_pWeaponStatsManager; }
+    CBuildingRemovalManager*            GetBuildingRemovalManager() { return m_pBuildingRemovalManager; }
+    CCustomWeaponManager*               GetCustomWeaponManager() { return m_pCustomWeaponManager; }
+    CFunctionUseLogger*                 GetFunctionUseLogger() { return m_pFunctionUseLogger; }
+    CMasterServerAnnouncer*             GetMasterServerAnnouncer() { return m_pMasterServerAnnouncer; }
+    SharedUtil::CAsyncTaskScheduler*    GetAsyncTaskScheduler() { return m_pAsyncTaskScheduler; }
     std::shared_ptr<CTrainTrackManager> GetTrainTrackManager() { return m_pTrainTrackManager; }
 
     void JoinPlayer(CPlayer& Player);
@@ -528,53 +527,53 @@ class CGame
     // Technically, this could be put somewhere else.  It's a callback function
     // which the voice server library will call to send out data.
 
-    CEvents                 m_Events;
-    CRemoteCalls*           m_pRemoteCalls;
-    CHTTPD*                 m_pHTTPD;
-    CMainConfig*            m_pMainConfig;
-    CBlipManager*           m_pBlipManager;
-    CGroups*                m_pGroups;
-    CColManager*            m_pColManager;
-    CObjectManager*         m_pObjectManager;
-    CPickupManager*         m_pPickupManager;
-    CPlayerManager*         m_pPlayerManager;
-    CRadarAreaManager*      m_pRadarAreaManager;
-    CVehicleManager*        m_pVehicleManager;
-    CPacketTranslator*      m_pPacketTranslator;
-    CMapManager*            m_pMapManager;
-    CElementDeleter         m_ElementDeleter;
-    CConnectHistory         m_FloodProtect;
-    CLuaManager*            m_pLuaManager;
-    CScriptDebugging*       m_pScriptDebugging;
-    CConsole*               m_pConsole;
-    CUnoccupiedVehicleSync* m_pUnoccupiedVehicleSync;
-    CPedSync*               m_pPedSync;
+    CEvents                           m_Events;
+    CRemoteCalls*                     m_pRemoteCalls;
+    CHTTPD*                           m_pHTTPD;
+    CMainConfig*                      m_pMainConfig;
+    CBlipManager*                     m_pBlipManager;
+    CGroups*                          m_pGroups;
+    CColManager*                      m_pColManager;
+    CObjectManager*                   m_pObjectManager;
+    CPickupManager*                   m_pPickupManager;
+    CPlayerManager*                   m_pPlayerManager;
+    CRadarAreaManager*                m_pRadarAreaManager;
+    CVehicleManager*                  m_pVehicleManager;
+    CPacketTranslator*                m_pPacketTranslator;
+    CMapManager*                      m_pMapManager;
+    CElementDeleter                   m_ElementDeleter;
+    CConnectHistory                   m_FloodProtect;
+    CLuaManager*                      m_pLuaManager;
+    CScriptDebugging*                 m_pScriptDebugging;
+    CConsole*                         m_pConsole;
+    CUnoccupiedVehicleSync*           m_pUnoccupiedVehicleSync;
+    CPedSync*                         m_pPedSync;
 #ifdef WITH_OBJECT_SYNC
-    CObjectSync* m_pObjectSync;
+    CObjectSync*                      m_pObjectSync;
 #endif
-    CMarkerManager*            m_pMarkerManager;
-    CClock*                    m_pClock;
-    CBanManager*               m_pBanManager;
-    CTeamManager*              m_pTeamManager;
-    CCommandLineParser         m_CommandLineParser;
-    CRegisteredCommands*       m_pRegisteredCommands;
-    CDatabaseManager*          m_pDatabaseManager;
-    CLuaCallbackManager*       m_pLuaCallbackManager;
-    CRegistryManager*          m_pRegistryManager;
-    CRegistry*                 m_pRegistry;
-    CAccountManager*           m_pAccountManager;
-    CLatentTransferManager*    m_pLatentTransferManager;
-    CDebugHookManager*         m_pDebugHookManager;
-    CPedManager*               m_pPedManager;
-    CResourceManager*          m_pResourceManager;
-    CAccessControlListManager* m_pACLManager;
-    CSettings*                 m_pSettings;
-    CZoneNames*                m_pZoneNames;
-    ASE*                       m_pASE;
-    CHandlingManager*          m_pHandlingManager;
-    CRPCFunctions*             m_pRPCFunctions;
-    CLanBroadcast*             m_pLanBroadcast;
-    CWaterManager*             m_pWaterManager;
+    CMarkerManager*                   m_pMarkerManager;
+    CClock*                           m_pClock;
+    CBanManager*                      m_pBanManager;
+    CTeamManager*                     m_pTeamManager;
+    CCommandLineParser                m_CommandLineParser;
+    CRegisteredCommands*              m_pRegisteredCommands;
+    CDatabaseManager*                 m_pDatabaseManager;
+    CLuaCallbackManager*              m_pLuaCallbackManager;
+    CRegistryManager*                 m_pRegistryManager;
+    CRegistry*                        m_pRegistry;
+    CAccountManager*                  m_pAccountManager;
+    CLatentTransferManager*           m_pLatentTransferManager;
+    CDebugHookManager*                m_pDebugHookManager;
+    CPedManager*                      m_pPedManager;
+    CResourceManager*                 m_pResourceManager;
+    CAccessControlListManager*        m_pACLManager;
+    CSettings*                        m_pSettings;
+    CZoneNames*                       m_pZoneNames;
+    ASE*                              m_pASE;
+    std::shared_ptr<CHandlingManager> m_HandlingManager;
+    CRPCFunctions*                    m_pRPCFunctions;
+    CLanBroadcast*                    m_pLanBroadcast;
+    CWaterManager*                    m_pWaterManager;
 
     CWeaponStatManager*      m_pWeaponStatsManager;
     CBuildingRemovalManager* m_pBuildingRemovalManager;