Merge branch 'master' into startstop

Author: Nico8340

Client/core/CMessageLoopHook.cpp

@@ -518,6 +518,13 @@ LRESULT CALLBACK CMessageLoopHook::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM w
                     return true;
                 }
 
+                // Process ALT + F4
+                if (uMsg == WM_SYSKEYDOWN && wParam == VK_F4)
+                {
+                    // Tell windows to handle this message.
+                    return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+                }
+
                 // If we handled mouse steering, don't let GTA.
                 // if ( !CCore::GetSingleton ().GetMouseControl()->ProcessMouseMove ( uMsg, wParam, lParam ) )
                 // Call GTA's window procedure.

Client/mods/deathmatch/logic/CClientBuildingManager.h

@@ -40,7 +40,11 @@ class CClientBuildingManager
 
 private:
     bool DoPoolResize(size_t newCapacity);
-    void AddToList(CClientBuilding* pBuilding) { m_List.push_back(pBuilding); }
+    void AddToList(CClientBuilding* pBuilding)
+    {
+        ResizePoolIfNeeds();
+        m_List.push_back(pBuilding);
+    }
     void RemoveFromList(CClientBuilding* pBuilding);
 
     std::list<CClientBuilding*> m_List;

Client/mods/deathmatch/logic/CClientGame.h

@@ -129,8 +129,12 @@ class CClientGame
         SCRIPTFILE,
         WATER,
         WEAPON,
-        POINTLIGHTS,
+        _DATABASE_CONNECTION, // server only
+        TRAIN_TRACK,
+        ROOT,
         UNKNOWN,
+        BUILDING,
+        POINTLIGHTS,
     };
 
     enum

Client/mods/deathmatch/logic/CClientPlayerVoice.cpp

@@ -398,6 +398,20 @@ bool CClientPlayerVoice::IsFxEffectEnabled(uint uiFxEffect)
     return m_EnabledEffects[uiFxEffect] ? true : false;
 }
 
+bool CClientPlayerVoice::SetFxEffectParameters(std::uint32_t uiFxEffect, void* params)
+{
+    if (IsFxEffectEnabled(uiFxEffect))
+        return BASS_FXSetParameters(m_FxEffects[uiFxEffect], params);
+    return false;
+}
+
+bool CClientPlayerVoice::GetFxEffectParameters(std::uint32_t uiFxEffect, void* params)
+{
+    if (IsFxEffectEnabled(uiFxEffect))
+        return BASS_FXGetParameters(m_FxEffects[uiFxEffect], params);
+    return false;
+}
+
 bool CClientPlayerVoice::GetPan(float& fPan)
 {
     fPan = 0.0f;

Client/mods/deathmatch/logic/CClientPlayerVoice.h

@@ -73,6 +73,9 @@ class CClientPlayerVoice
     bool SetFxEffect(uint uiFxEffect, bool bEnable);
     bool IsFxEffectEnabled(uint uiFxEffect);
 
+    bool SetFxEffectParameters(std::uint32_t uiFxEffect, void* params);
+    bool GetFxEffectParameters(std::uint32_t uiFxEffect, void* params);
+
     bool IsActive() { return m_bVoiceActive; }
 
 private:

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -4219,6 +4219,26 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)
                     break;
                 }
 
+                case CClientGame::BUILDING:
+                {
+                    std::uint16_t        modelId;
+                    SRotationRadiansSync rotationRadians(false);
+
+                    // Read out the position, rotation, object ID
+                    bitStream.Read(&position);
+                    bitStream.Read(&rotationRadians);
+                    bitStream.ReadCompressed(modelId);
+
+                    if (!CClientBuildingManager::IsValidModel(modelId))
+                        modelId = 1700;
+
+                    bitStream.Read(LowLodObjectID);
+                    CClientBuilding* pBuilding = new CClientBuilding(g_pClientGame->m_pManager, EntityID, modelId, position.data.vecPosition, rotationRadians.data.vecRotation, ucInterior);
+
+                    pBuilding->SetUsesCollision(bCollisonsEnabled);
+                    break;
+                }
+
                 default:
                 {
                     assert(0);
@@ -4288,10 +4308,18 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)
 
         if (TempLowLodObjectID != INVALID_ELEMENT_ID)
         {
-            CClientObject* pTempObject = DynamicCast<CClientObject>(pTempEntity);
-            CClientObject* pLowLodObject = DynamicCast<CClientObject>(CElementIDs::GetElement(TempLowLodObjectID));
-            if (pTempObject)
-                pTempObject->SetLowLodObject(pLowLodObject);
+            if (CClientObject* pTempObject = DynamicCast<CClientObject>(pTempEntity))
+            {
+                CClientObject* pLowLodObject = DynamicCast<CClientObject>(CElementIDs::GetElement(TempLowLodObjectID));
+                if (pTempObject)
+                    pTempObject->SetLowLodObject(pLowLodObject);
+            }
+            else if (CClientBuilding* pTempObject = DynamicCast<CClientBuilding>(pTempEntity))
+            {
+                CClientBuilding* pLowLod = DynamicCast<CClientBuilding>(CElementIDs::GetElement(TempLowLodObjectID));
+                if (pTempObject)
+                    pTempObject->SetLowLodBuilding(pLowLod);
+            }
         }
 
         delete pEntityStuff;