Merge branch 'master' into shadow

Author: Proxy-99

Client/game_sa/CCameraSA.cpp

@@ -443,3 +443,18 @@ float CCameraSA::GetShakeForce()
     CCameraSAInterface* pCameraInterface = GetInterface();
     return pCameraInterface->m_fCamShakeForce;
 }
+
+void CCameraSA::ShakeCamera(float radius, float x, float y, float z) noexcept
+{
+    DWORD               dwFunc = FUNC_ShakeCam;
+    CCameraSAInterface* cameraInterface = GetInterface();
+    _asm
+    {
+        mov  ecx, cameraInterface
+        push z
+        push y
+        push x
+        push radius
+        call dwFunc
+    }
+}

Client/game_sa/CCameraSA.h

@@ -27,6 +27,7 @@
 #define FUNC_GetFading                      0x50ADE0
 #define FUNC_Fade                           0x50AC20
 #define FUNC_SetFadeColour                  0x50BF00
+#define FUNC_ShakeCam                       0x50A9F0
 
 #define VAR_CameraRotation                  0xB6F178 // used for controling where the player faces
 #define VAR_VehicleCameraView               0xB6F0DC
@@ -426,4 +427,6 @@ class CCameraSA : public CCamera
     void      RestoreLastGoodState();
     void      SetShakeForce(float fShakeForce);
     float     GetShakeForce();
+
+    void ShakeCamera(float radius, float x, float y, float z) noexcept override;
 };

Client/mods/deathmatch/logic/CClient3DMarker.cpp

@@ -102,3 +102,11 @@ void CClient3DMarker::DoPulse()
         }
     }
 }
+
+void CClient3DMarker::SetColor(const SColor& color) noexcept
+{
+    m_Color = color;
+
+    if (!m_ignoreAlphaLimits && m_dwType == MARKER3D_ARROW)
+        m_Color.A = 255;
+}

Client/mods/deathmatch/logic/CClient3DMarker.h

@@ -45,14 +45,17 @@ class CClient3DMarker : public CClientMarkerCommon
     void SetVisible(bool bVisible) { m_bVisible = bVisible; };
 
     SColor GetColor() const { return m_Color; }
-    void   SetColor(const SColor& color) { m_Color = color; }
+    void   SetColor(const SColor& color) noexcept;
 
     float GetSize() const { return m_fSize; };
     void  SetSize(float fSize) { m_fSize = fSize; };
 
     float GetPulseFraction() { return static_cast<float>(m_pMarker->GetPulseFraction()); };
     void  SetPulseFraction(float fFraction) { m_pMarker->SetPulseFraction(fFraction); };
 
+    void SetIgnoreAlphaLimits(bool ignore) noexcept { m_ignoreAlphaLimits = ignore; };
+    bool AreAlphaLimitsIgnored() const noexcept override { return m_ignoreAlphaLimits; };
+
 protected:
     void StreamIn();
     void StreamOut();
@@ -70,4 +73,5 @@ class CClient3DMarker : public CClientMarkerCommon
     C3DMarker*   m_pMarker;
     unsigned int m_ulIdentifier;
     bool         m_bMarkerStreamedIn;
+    bool         m_ignoreAlphaLimits;
 };

Client/mods/deathmatch/logic/CClientCamera.cpp

@@ -634,3 +634,8 @@ void CClientCamera::SetGtaMatrix(const CMatrix& matInNew, CCam* pCam) const
     *pCam->GetFront() = matNew.vFront;
     *pCam->GetSource() = matNew.vPos;
 }
+
+void CClientCamera::ShakeCamera(float radius, float x, float y, float z) noexcept
+{
+    m_pCamera->ShakeCamera(radius, x, y, z);
+}

Client/mods/deathmatch/logic/CClientCamera.h

@@ -64,6 +64,8 @@ class CClientCamera final : public CClientEntity
     void           SetFocusToLocalPlayer();
     void           Reset();
 
+    void ShakeCamera(float radius, float x, float y, float z) noexcept;
+
     void            SetCameraVehicleViewMode(eVehicleCamMode eMode);
     void            SetCameraPedViewMode(ePedCamMode eMode);
     eVehicleCamMode GetCameraVehicleViewMode();

Client/mods/deathmatch/logic/CClientCheckpoint.cpp

@@ -22,11 +22,12 @@ CClientCheckpoint::CClientCheckpoint(CClientMarker* pThis)
     m_bStreamedIn = false;
     m_bVisible = true;
     m_uiIcon = CClientCheckpoint::ICON_NONE;
-    m_Color = SColorRGBA(255, 0, 0, 255);
+    m_Color = SColorRGBA(255, 0, 0, 128);
     m_fSize = 4.0f;
     m_dwType = CHECKPOINT_EMPTYTUBE;
     m_vecDirection.fX = 1.0f;
     m_bHasTarget = false;
+    m_ignoreAlphaLimits = false;
     m_TargetArrowColor = SColorRGBA(255, 64, 64, 255);
     m_TargetArrowSize = m_fSize * 0.625f;
 }
@@ -250,8 +251,14 @@ void CClientCheckpoint::SetColor(const SColor& color)
     // Different from our current color?
     if (m_Color != color)
     {
-        // Set it and recreate
+        // Set it
         m_Color = color;
+
+        // Default alpha
+        if (!m_ignoreAlphaLimits && GetCheckpointType() == CClientCheckpoint::TYPE_NORMAL)
+            m_Color.A = 128;
+
+        // Recreate
         ReCreate();
     }
 }

Client/mods/deathmatch/logic/CClientCheckpoint.h

@@ -74,6 +74,9 @@ class CClientCheckpoint : public CClientMarkerCommon
     static bool          IconToString(unsigned char ucIcon, SString& strOutString);
     void                 ReCreateWithSameIdentifier();
 
+    void SetIgnoreAlphaLimits(bool ignore) noexcept { m_ignoreAlphaLimits = ignore; };
+    bool AreAlphaLimitsIgnored() const noexcept override { return m_ignoreAlphaLimits; };
+
     SColor GetTargetArrowColor() const noexcept { return m_TargetArrowColor; };
     float  GetTargetArrowSize() const noexcept { return m_TargetArrowSize; };
     void   SetTargetArrowProperties(const SColor& arrowColor, float size) noexcept;
@@ -100,6 +103,7 @@ class CClientCheckpoint : public CClientMarkerCommon
     float            m_fSize;
     SColor           m_Color;
     CCheckpoint*     m_pCheckpoint;
+    bool             m_ignoreAlphaLimits;
     SColor           m_TargetArrowColor;
     float            m_TargetArrowSize;
 

Client/mods/deathmatch/logic/CClientCorona.h

@@ -41,6 +41,9 @@ class CClientCorona : public CClientMarkerCommon
     void SetReflectionEnabled(bool bEnabled) { m_bReflectionEnabled = bEnabled; };
     bool IsReflectionEnabled() const { return m_bReflectionEnabled; };
 
+    void SetIgnoreAlphaLimits(bool ignore) noexcept {};
+    bool AreAlphaLimitsIgnored() const noexcept override { return true; };
+
 protected:
     bool IsStreamedIn() { return m_bStreamedIn; };
     void StreamIn();

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -3614,10 +3614,10 @@ bool CClientGame::StaticProcessCollisionHandler(CEntitySAInterface* pThisInterfa
 
 bool CClientGame::StaticVehicleCollisionHandler(CVehicleSAInterface*& pCollidingVehicle, CEntitySAInterface* pCollidedVehicle, int iModelIndex,
                                                 float fDamageImpulseMag, float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos,
-                                                CVector vecCollisionVelocity)
+                                                CVector vecCollisionVelocity, bool isProjectile)
 {
     return g_pClientGame->VehicleCollisionHandler(pCollidingVehicle, pCollidedVehicle, iModelIndex, fDamageImpulseMag, fCollidingDamageImpulseMag, usPieceType,
-                                                  vecCollisionPos, vecCollisionVelocity);
+                                                  vecCollisionPos, vecCollisionVelocity, isProjectile);
 }
 
 bool CClientGame::StaticVehicleDamageHandler(CEntitySAInterface* pVehicleInterface, float fLoss, CEntitySAInterface* pAttackerInterface, eWeaponType weaponType,
@@ -4541,7 +4541,7 @@ void CClientGame::DeathHandler(CPed* pKilledPedSA, unsigned char ucDeathReason,
 }
 
 bool CClientGame::VehicleCollisionHandler(CVehicleSAInterface*& pCollidingVehicle, CEntitySAInterface* pCollidedWith, int iModelIndex, float fDamageImpulseMag,
-                                          float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity)
+                                          float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity, bool isProjectile)
 {
     if (pCollidingVehicle && pCollidedWith)
     {
@@ -4556,7 +4556,7 @@ bool CClientGame::VehicleCollisionHandler(CVehicleSAInterface*& pCollidingVehicl
             }
 
             CClientVehicle* pClientVehicle = static_cast<CClientVehicle*>(pVehicleClientEntity);
-            CClientEntity*  pCollidedWithClientEntity = pPools->GetClientEntity((DWORD*)pCollidedWith);
+            CClientEntity*  pCollidedWithClientEntity = !isProjectile ? pPools->GetClientEntity((DWORD*)pCollidedWith) : m_pManager->GetProjectileManager()->Get(pCollidedWith);
 
             CLuaArguments Arguments;
             if (pCollidedWithClientEntity)