Backport relevant changes from 'master' to release/1.6.0

Author: Dutchman101

Client/core/CCommandFuncs.cpp

@@ -318,6 +318,10 @@ void CCommandFuncs::Reconnect(const char* szParameters)
         // Start the connect
         if (CCore::GetSingleton().GetConnectManager()->Reconnect(strHost.c_str(), usPort, strPassword.c_str(), false))
         {
+            if (CCore::GetSingleton().GetConnectManager()->WasQuickConnect())
+            {
+                CCore::GetSingleton().GetConnectManager()->SetQuickConnect(false);
+            }
             CCore::GetSingleton().GetConsole()->Printf(_("reconnect: Reconnecting to %s:%u..."), strHost.c_str(), usPort);
         }
         else

Client/core/CConnectManager.h

@@ -26,10 +26,14 @@ class CConnectManager
 
     bool Abort();
 
+    bool WasQuickConnect() const noexcept { return m_quickConnect; }
+
     void DoPulse();
 
     void OnServerExists();
 
+    void SetQuickConnect(bool quick) noexcept { m_quickConnect = quick; }
+    
     static void OpenServerFirewall(in_addr Address, ushort usHttpPort = 80, bool bHighPriority = false);
 
     static bool StaticProcessPacket(unsigned char ucPacketID, class NetBitStreamInterface& bitStream);
@@ -59,4 +63,5 @@ class CConnectManager
     bool             m_bNotifyServerBrowser;
 
     bool CheckNickProvided(const char* szNick);
+    bool m_quickConnect{false};
 };

Client/core/CMainMenu.cpp

@@ -850,6 +850,9 @@ bool CMainMenu::OnMenuClick(CGUIMouseEventArgs Args)
                 }
 
                 break;
+            case MENU_ITEM_QUICK_CONNECT:
+                AskUserIfHeWantsToDisconnect(m_pHoveredItem->menuType);
+                return true;
             default:
                 break;
         }
@@ -914,7 +917,8 @@ bool CMainMenu::OnQuickConnectButtonClick(CGUIElement* pElement, bool left)
             ShowNetworkNotReadyWindow();
             return true;
         }
-
+        
+        g_pCore->GetConnectManager()->SetQuickConnect(true);
         g_pCore->GetCommands()->Execute("reconnect", "");
     }
     else
@@ -1262,6 +1266,9 @@ void CMainMenu::WantsToDisconnectCallBack(void* pData, uint uiButton)
             case MENU_ITEM_DISCONNECT:
                 OnDisconnectButtonClick();
                 break;
+            case MENU_ITEM_QUICK_CONNECT:
+                OnQuickConnectButtonClick(nullptr, true);
+                break;
             default:
                 break;
         }

Client/core/DXHook/CProxyDirect3DDevice9.cpp

@@ -117,6 +117,7 @@ ULONG CProxyDirect3DDevice9::Release()
         // Call event handler
         CDirect3DEvents9::OnDirect3DDeviceDestroy(m_pDevice);
         delete this;
+        return ulRefCount - 1;
     }
 
     return m_pDevice->Release();

Client/game_sa/CPoolsSA.cpp

@@ -26,6 +26,7 @@
 #include "CWorldSA.h"
 
 #include "enums/VehicleClass.h"
+#include <new>
 
 extern CGameSA* pGame;
 
@@ -242,7 +243,7 @@ CObject* CPoolsSA::AddObject(CClientObject* pClientObject, DWORD dwModelID, bool
 
     if (m_objectPool.ulCount < MAX_OBJECTS)
     {
-        pObject = new CObjectSA(dwModelID, bBreakingDisabled);
+        pObject = new (std::nothrow) CObjectSA(dwModelID, bBreakingDisabled);
 
         if (pObject && AddObjectToPool(pClientObject, pObject))
         {

Client/game_sa/CRenderWareSA.cpp

@@ -285,7 +285,18 @@ RpClump* CRenderWareSA::ReadDFF(const SString& strFilename, const SString& buffe
 
     // rockstar's collision hack: set the global particle emitter to the modelinfo pointer of this model
     if (bLoadEmbeddedCollisions)
+    {
+        // Vehicles have their collision loaded through the CollisionModel plugin, so we need to remove the current collision to prevent a memory leak.
+        // This needs to be done here before reading the stream data, because plugins are read in RpClumpStreamRead.
+        CModelInfo* modelInfo = pGame->GetModelInfo(usModelID);
+        if (modelInfo)
+        {
+            if (auto* modelInfoInterface = modelInfo->GetInterface())
+                ((void(__thiscall*)(CBaseModelInfoSAInterface*))0x4C4C40)(modelInfoInterface); // CBaseModelInfo::DeleteCollisionModel
+        }
+
         RpPrtStdGlobalDataSetStreamEmbedded((void*)pPool[usModelID]);
+    }
 
     // read the clump with all its extensions
     RpClump* pClump = RpClumpStreamRead(streamModel);

Client/mods/deathmatch/logic/CClientEntity.cpp

@@ -791,7 +791,8 @@ void CClientEntity::CallEventNoParent(const char* szName, const CLuaArguments& A
     // Call it on all our children
     if (!m_Children.empty())
     {
-        for (CClientEntity* pEntity : *GetChildrenListSnapshot())
+        CElementListSnapshotRef pChildrenSnapshot = GetChildrenListSnapshot();
+		for (CClientEntity* pEntity : *pChildrenSnapshot)
         {
             if (!pEntity->IsBeingDeleted())
             {

Client/mods/deathmatch/logic/CClientExplosionManager.cpp

@@ -39,6 +39,23 @@ bool CClientExplosionManager::Hook_StaticExplosionCreation(CEntity* pGameExplodi
     return g_pExplosionManager->Hook_ExplosionCreation(pGameExplodingEntity, pGameCreator, vecPosition, explosionType);
 }
 
+eWeaponType CClientExplosionManager::GetWeaponTypeFromExplosionType(const eExplosionType explosionType)
+{
+    switch (explosionType) {
+        case EXP_TYPE_GRENADE:
+            return WEAPONTYPE_GRENADE;
+        case EXP_TYPE_MOLOTOV:
+            return WEAPONTYPE_MOLOTOV;
+        case EXP_TYPE_ROCKET:
+        case EXP_TYPE_ROCKET_WEAK:
+            return WEAPONTYPE_ROCKET;
+        case EXP_TYPE_TANK_GRENADE:
+            return WEAPONTYPE_TANK_GRENADE;
+        default:
+            return WEAPONTYPE_EXPLOSION;
+    }
+}
+
 bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEntity, CEntity* pGameCreator, const CVector& vecPosition,
                                                      eExplosionType explosionType)
 {
@@ -53,7 +70,23 @@ bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEnti
     CClientEntity* const pResponsible = pPools->GetClientEntity(reinterpret_cast<DWORD*>(pResponsibleGameEntity->GetInterface()));
 
     if (!pResponsible)
-        return false;
+    {
+        if (!pGameCreator)
+            return false;
+
+        CClientPlayer* localPlayer = m_pManager->GetPlayerManager()->GetLocalPlayer();
+        if (!localPlayer || localPlayer->GetGameEntity() != pGameCreator)
+            return false;
+
+        eWeaponType explosionWeaponType = GetWeaponTypeFromExplosionType(explosionType);
+
+        CLuaArguments arguments;
+        arguments.PushNumber(vecPosition.fX);
+        arguments.PushNumber(vecPosition.fY);
+        arguments.PushNumber(vecPosition.fZ);
+        arguments.PushNumber(explosionWeaponType);
+        return localPlayer->CallEvent("onClientExplosion", arguments, true);
+    }
 
     // Determine the used weapon
     eWeaponType explosionWeaponType = WEAPONTYPE_EXPLOSION;
@@ -167,25 +200,22 @@ CExplosion* CClientExplosionManager::Create(eExplosionType explosionType, CVecto
     if (responsibleWeapon != WEAPONTYPE_UNARMED)
         m_LastWeaponType = responsibleWeapon;
     else
+        m_LastWeaponType = GetWeaponTypeFromExplosionType(explosionType);
+
+    if (pCreator && pCreator->IsLocalEntity())
     {
-        switch (explosionType)
+        bool allowExplosion = Hook_ExplosionCreation(nullptr, pGameCreator, vecPosition, explosionType);
+        if (!allowExplosion)
+            return nullptr;
+    }
+    else if (!pCreator)
+    {
+        CClientPlayer* localPlayer = m_pManager->GetPlayerManager()->GetLocalPlayer();
+        if (localPlayer)
         {
-            case EXP_TYPE_GRENADE:
-                m_LastWeaponType = WEAPONTYPE_GRENADE;
-                break;
-            case EXP_TYPE_MOLOTOV:
-                m_LastWeaponType = WEAPONTYPE_MOLOTOV;
-                break;
-            case EXP_TYPE_ROCKET:
-            case EXP_TYPE_ROCKET_WEAK:
-                m_LastWeaponType = WEAPONTYPE_ROCKET;
-                break;
-            case EXP_TYPE_TANK_GRENADE:
-                m_LastWeaponType = WEAPONTYPE_TANK_GRENADE;
-                break;
-            default:
-                m_LastWeaponType = WEAPONTYPE_EXPLOSION;
-                break;
+            bool allowExplosion = Hook_ExplosionCreation(nullptr, localPlayer->GetGameEntity(), vecPosition, explosionType);
+            if (!allowExplosion)
+                return nullptr;
         }
     }
 

Client/mods/deathmatch/logic/CClientExplosionManager.h

@@ -34,5 +34,6 @@ class CClientExplosionManager
     CClientEntityPtr m_pLastCreator;
 
 private:
-    CClientManager* m_pManager;
+    CClientManager*  m_pManager;
+    eWeaponType      GetWeaponTypeFromExplosionType(const eExplosionType explosionType);
 };