Fix marker screen detection and click events

Author: MohabCodeX

Client/mods/deathmatch/logic/CClientEntity.cpp

@@ -1334,6 +1334,13 @@ bool CClientEntity::IsOnScreen()
     {
         return pEntity->IsOnScreen();
     }
+    
+    if (GetType() == CCLIENTMARKER)
+    {
+        CClientMarker* pMarker = static_cast<CClientMarker*>(this);
+        return pMarker->IsClientSideOnScreen();
+    }
+    
     return false;
 }
 

Client/mods/deathmatch/logic/CClientEntity.h

@@ -84,6 +84,7 @@ enum eClientEntityType
 
 class CEntity;
 class CClientColShape;
+class CClientMarker;
 class CClientPed;
 class CCustomData;
 class CElementGroup;

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -2325,6 +2325,55 @@ void CClientGame::ProcessServerControlBind(CControlFunctionBind* pBind)
     m_pNetAPI->RPC(KEY_BIND, bitStream.pBitStream);
 }
 
+CClientEntity* CClientGame::CheckClientSideEntityClick(float fScreenX, float fScreenY)
+{
+    if (!m_pMarkerManager)
+        return NULL;
+
+    CClientMarker* pClosestMarker = NULL;
+    float fClosestDist = 99999.9f;
+
+    CFastList<CClientMarker*>::const_iterator iter = m_pMarkerManager->m_Markers.begin();
+    for (; iter != m_pMarkerManager->m_Markers.end(); ++iter)
+    {
+        CClientMarker* pMarker = *iter;
+        if (pMarker && pMarker->IsStreamedIn() && pMarker->IsVisible())
+        {
+            CVector vecPosition;
+            pMarker->GetPosition(vecPosition);
+
+            CVector vecScreen;
+            g_pCore->GetGraphics()->CalcScreenCoors(&vecPosition, &vecScreen);
+            
+            if (pMarker->IsClientSideOnScreen())
+            {
+                CSphere boundingSphere = pMarker->GetWorldBoundingSphere();
+                
+                CVector vecEdgePos = boundingSphere.vecPosition;
+                vecEdgePos.fX += boundingSphere.fRadius;
+                
+                CVector vecCenterScreen, vecEdgeScreen;
+                g_pCore->GetGraphics()->CalcScreenCoors(&boundingSphere.vecPosition, &vecCenterScreen);
+                g_pCore->GetGraphics()->CalcScreenCoors(&vecEdgePos, &vecEdgeScreen);
+                
+                float fScreenRadius = abs(vecEdgeScreen.fX - vecCenterScreen.fX);
+                
+                float fDistX = vecCenterScreen.fX - fScreenX;
+                float fDistY = vecCenterScreen.fY - fScreenY;
+                float fDist = sqrt(fDistX * fDistX + fDistY * fDistY);
+
+                if (fDist < fScreenRadius && fDist < fClosestDist)
+                {
+                    fClosestDist = fDist;
+                    pClosestMarker = pMarker;
+                }
+            }
+        }
+    }
+
+    return pClosestMarker;
+}
+
 bool CClientGame::ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     bool bCursorForcedVisible = g_pCore->IsCursorForcedVisible();
@@ -2419,6 +2468,17 @@ bool CClientGame::ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wPa
                         pColPoint->Destroy();
                     }
 
+                    if (!pCollisionEntity)
+                    {
+                        CClientEntity* pClientSideEntity = CheckClientSideEntityClick((float)iX, (float)iY);
+                        if (pClientSideEntity)
+                        {
+                            pCollisionEntity = pClientSideEntity;
+                            if (!pClientSideEntity->IsLocalEntity())
+                                CollisionEntityID = pClientSideEntity->GetID();
+                        }
+                    }
+
                     const char* szButton = NULL;
                     const char* szState = NULL;
                     switch (ucButtonHit)

Client/mods/deathmatch/logic/CClientGame.h

@@ -381,6 +381,7 @@ class CClientGame
     void        ProcessServerControlBind(CControlFunctionBind* pBind);
 
     bool ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    CClientEntity* CheckClientSideEntityClick(float fScreenX, float fScreenY);
     bool AreCursorEventsEnabled() { return m_bCursorEventsEnabled; }
     void SetCursorEventsEnabled(bool bCursorEventsEnabled) { m_bCursorEventsEnabled = bCursorEventsEnabled; }
 

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -16,6 +16,11 @@ extern CClientGame* g_pClientGame;
 #define M_PI 3.14159265358979323846
 #endif
 
+// Threshold for determining if a marker is considered on-screen.
+// The value 0.1f represents the minimum depth (Z value in screen coordinates) at which a marker is visible.
+// Markers with a screen Z value below this threshold are considered off-screen.
+constexpr float CLIENT_MARKER_ONSCREEN_THRESHOLD = 0.1f;
+
 unsigned int CClientMarker::m_uiStreamedInMarkers = 0;
 
 CClientMarker::CClientMarker(CClientManager* pManager, ElementID ID, int iMarkerType) : ClassInit(this), CClientStreamElement(pManager->GetMarkerStreamer(), ID)
@@ -322,7 +327,6 @@ void CClientMarker::SetSize(float fSize)
             break;
         }
     }
-   
     m_pMarker->SetSize(fSize);
 }
 
@@ -540,3 +544,36 @@ void CClientMarker::SetIgnoreAlphaLimits(bool ignore)
 {
     m_pMarker->SetIgnoreAlphaLimits(ignore);
 }
+
+bool CClientMarker::IsClientSideOnScreen()
+{
+    if (!IsStreamedIn() || !IsVisible())
+        return false;
+
+    CVector vecPosition;
+    GetPosition(vecPosition);
+
+    CVector vecScreen;
+    g_pCore->GetGraphics()->CalcScreenCoors(&vecPosition, &vecScreen);
+
+    if (vecScreen.fZ <= CLIENT_MARKER_ONSCREEN_THRESHOLD)
+        return false;
+
+    float fResWidth = static_cast<float>(g_pCore->GetGraphics()->GetViewportWidth());
+    float fResHeight = static_cast<float>(g_pCore->GetGraphics()->GetViewportHeight());
+
+    CSphere boundingSphere = GetWorldBoundingSphere();
+    CVector vecEdgePos = boundingSphere.vecPosition;
+    vecEdgePos.fX += boundingSphere.fRadius;
+
+    CVector vecEdgeScreen;
+    g_pCore->GetGraphics()->CalcScreenCoors(&vecEdgePos, &vecEdgeScreen);
+
+    if (vecEdgeScreen.fZ <= CLIENT_MARKER_ONSCREEN_THRESHOLD)
+        return true;
+
+    float fScreenRadius = fabs(vecEdgeScreen.fX - vecScreen.fX);
+
+    return (vecScreen.fX + fScreenRadius) >= 0.0f && (vecScreen.fX - fScreenRadius) <= fResWidth &&
+           (vecScreen.fY + fScreenRadius) >= 0.0f && (vecScreen.fY - fScreenRadius) <= fResHeight;
+}

Client/mods/deathmatch/logic/CClientMarker.h

@@ -77,6 +77,8 @@ class CClientMarker final : public CClientStreamElement, private CClientColCallb
 
     static bool IsLimitReached();
 
+    bool IsClientSideOnScreen();
+
     CClientColShape* GetColShape() { return m_pCollision; }
 
     void Callback_OnCollision(CClientColShape& Shape, CClientEntity& Entity);