Refactor

Author: MohabCodeX

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -73,9 +73,9 @@ CVector             g_vecBulletFireEndPosition;
 #define DOUBLECLICK_TIMEOUT          330
 #define DOUBLECLICK_MOVE_THRESHOLD   10.0f
 
-// Ray casting constants for marker click detection
-constexpr float MARKER_CLICK_RAY_DEPTH = 300.0f;     // Screen-to-world ray projection depth
-constexpr float MARKER_CLICK_MAX_DISTANCE = 99999.9f; // Maximum distance for closest marker comparison
+// Ray casting constants for click detection
+constexpr float CLICK_RAY_DEPTH = 300.0f;     // Screen-to-world ray projection depth
+constexpr float MAX_CLICK_DISTANCE = 6000.0f; // Maximum distance for closest marker comparison
 
 static constexpr long long TIME_DISCORD_UPDATE_RATE = 15000;
 
@@ -2329,55 +2329,55 @@ void CClientGame::ProcessServerControlBind(CControlFunctionBind* pBind)
     m_pNetAPI->RPC(KEY_BIND, bitStream.pBitStream);
 }
 
-CClientMarker* CClientGame::CheckMarkerClick(float fScreenX, float fScreenY, float& fDistance)
+CClientMarker* CClientGame::CheckMarkerClick(float screenX, float screenY, float& distance) noexcept
 {
     if (!m_pMarkerManager)
         return nullptr;
 
-    CCamera* pCamera = g_pGame->GetCamera();
-    CMatrix matCamera;
-    pCamera->GetMatrix(&matCamera);
-    CVector vecOrigin = matCamera.vPos;
+    CCamera* camera = g_pGame->GetCamera();
+    CMatrix cameraMatrix;
+    camera->GetMatrix(&cameraMatrix);
+    CVector origin = cameraMatrix.vPos;
 
-    CVector vecTarget, vecScreen(fScreenX, fScreenY, MARKER_CLICK_RAY_DEPTH);
-    g_pCore->GetGraphics()->CalcWorldCoors(&vecScreen, &vecTarget);
+    CVector target, screen(screenX, screenY, CLICK_RAY_DEPTH);
+    g_pCore->GetGraphics()->CalcWorldCoors(&screen, &target);
 
-    CVector vecRayDir = vecTarget - vecOrigin;
-    vecRayDir.Normalize();
+    CVector rayDirection = target - origin;
+    rayDirection.Normalize();
 
-    CClientMarker* pClosestMarker = nullptr;
-    float fClosestDist = MARKER_CLICK_MAX_DISTANCE;
+    CClientMarker* closestMarker = nullptr;
+    float closestDistance = MAX_CLICK_DISTANCE;
 
-    for (auto* pMarker : m_pMarkerManager->m_Markers)
+    for (auto* marker : m_pMarkerManager->m_Markers)
     {
-        if (!pMarker || !pMarker->IsStreamedIn() || !pMarker->IsVisible())
+        if (!marker || !marker->IsStreamedIn() || !marker->IsVisible())
             continue;
 
-        if (!pMarker->IsClientSideOnScreen())
+        if (!marker->IsClientSideOnScreen())
             continue;
 
-        CSphere boundingSphere = pMarker->GetWorldBoundingSphere();
+        CSphere boundingSphere = marker->GetWorldBoundingSphere();
 
-        CVector vecToSphere = boundingSphere.vecPosition - vecOrigin;
-        float fProjection = vecToSphere.DotProduct(&vecRayDir);
+        CVector toSphere = boundingSphere.vecPosition - origin;
+        float projection = toSphere.DotProduct(&rayDirection);
 
-        if (fProjection <= 0.0f)
+        if (projection <= 0.0f)
             continue;
 
-        CVector vecClosestPoint = vecOrigin + vecRayDir * fProjection;
-        float fDistanceToRay = (boundingSphere.vecPosition - vecClosestPoint).Length();
+        CVector closestPoint = origin + rayDirection * projection;
+        float distanceToRay = (boundingSphere.vecPosition - closestPoint).Length();
 
-        if (fDistanceToRay <= boundingSphere.fRadius && fProjection < fClosestDist)
+        if (distanceToRay <= boundingSphere.fRadius && projection < closestDistance)
         {
-            fClosestDist = fProjection;
-            pClosestMarker = pMarker;
+            closestDistance = projection;
+            closestMarker = marker;
         }
     }
 
-    if (pClosestMarker)
-        fDistance = fClosestDist;
+    if (closestMarker)
+        distance = closestDistance;
 
-    return pClosestMarker;
+    return closestMarker;
 }
 
 bool CClientGame::ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -2429,7 +2429,7 @@ bool CClientGame::ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wPa
 
                     CVector2D vecCursorPosition((float)iX, (float)iY);
 
-                    CVector vecOrigin, vecTarget, vecScreen((float)iX, (float)iY, 300.0f);
+                    CVector vecOrigin, vecTarget, vecScreen((float)iX, (float)iY, CLICK_RAY_DEPTH);
                     g_pCore->GetGraphics()->CalcWorldCoors(&vecScreen, &vecTarget);
 
                     // Grab the camera position
@@ -2613,7 +2613,7 @@ bool CClientGame::ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wPa
                 CVector2D vecResolution = g_pCore->GetGUI()->GetResolution();
                 CVector2D vecCursorPosition(((float)iX) / vecResolution.fX, ((float)iY) / vecResolution.fY);
 
-                CVector vecTarget, vecScreen((float)iX, (float)iY, MARKER_CLICK_RAY_DEPTH);
+                CVector vecTarget, vecScreen((float)iX, (float)iY, CLICK_RAY_DEPTH);
                 g_pCore->GetGraphics()->CalcWorldCoors(&vecScreen, &vecTarget);
 
                 // Call the onClientCursorMove event

Client/mods/deathmatch/logic/CClientGame.h

@@ -381,7 +381,7 @@ class CClientGame
     void        ProcessServerControlBind(CControlFunctionBind* pBind);
 
     bool ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-    CClientMarker* CheckMarkerClick(float fScreenX, float fScreenY, float& fDistance);
+    CClientMarker* CheckMarkerClick(float screenX, float screenY, float& distance) noexcept;
     bool AreCursorEventsEnabled() { return m_bCursorEventsEnabled; }
     void SetCursorEventsEnabled(bool bCursorEventsEnabled) { m_bCursorEventsEnabled = bCursorEventsEnabled; }
 

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -546,35 +546,35 @@ void CClientMarker::SetIgnoreAlphaLimits(bool ignore)
     m_pMarker->SetIgnoreAlphaLimits(ignore);
 }
 
-bool CClientMarker::IsClientSideOnScreen()
+bool CClientMarker::IsClientSideOnScreen() noexcept
 {
     if (!IsStreamedIn() || !IsVisible())
         return false;
 
-    CVector vecPosition;
-    GetPosition(vecPosition);
+    CVector position;
+    GetPosition(position);
 
-    CVector vecScreen;
-    g_pCore->GetGraphics()->CalcScreenCoors(&vecPosition, &vecScreen);
+    CVector screen;
+    g_pCore->GetGraphics()->CalcScreenCoors(&position, &screen);
 
-    if (vecScreen.fZ <= CLIENT_MARKER_ONSCREEN_THRESHOLD)
+    if (screen.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());
+    float resWidth = static_cast<float>(g_pCore->GetGraphics()->GetViewportWidth());
+    float resHeight = static_cast<float>(g_pCore->GetGraphics()->GetViewportHeight());
 
     CSphere boundingSphere = GetWorldBoundingSphere();
-    CVector vecEdgePos = boundingSphere.vecPosition;
-    vecEdgePos.fX += boundingSphere.fRadius;
+    CVector edgePos = boundingSphere.vecPosition;
+    edgePos.fX += boundingSphere.fRadius;
 
-    CVector vecEdgeScreen;
-    g_pCore->GetGraphics()->CalcScreenCoors(&vecEdgePos, &vecEdgeScreen);
+    CVector edgeScreen;
+    g_pCore->GetGraphics()->CalcScreenCoors(&edgePos, &edgeScreen);
 
-    if (vecEdgeScreen.fZ <= CLIENT_MARKER_ONSCREEN_THRESHOLD)
+    if (edgeScreen.fZ <= CLIENT_MARKER_ONSCREEN_THRESHOLD)
         return true;
 
-    float fScreenRadius = fabs(vecEdgeScreen.fX - vecScreen.fX);
+    float screenRadius = fabs(edgeScreen.fX - screen.fX);
 
-    return (vecScreen.fX + fScreenRadius) >= 0.0f && (vecScreen.fX - fScreenRadius) <= fResWidth &&
-           (vecScreen.fY + fScreenRadius) >= 0.0f && (vecScreen.fY - fScreenRadius) <= fResHeight;
+    return (screen.fX + screenRadius) >= 0.0f && (screen.fX - screenRadius) <= resWidth &&
+           (screen.fY + screenRadius) >= 0.0f && (screen.fY - screenRadius) <= resHeight;
 }

Client/mods/deathmatch/logic/CClientMarker.h

@@ -77,7 +77,7 @@ class CClientMarker final : public CClientStreamElement, private CClientColCallb
 
     static bool IsLimitReached();
 
-    bool IsClientSideOnScreen();
+    bool IsClientSideOnScreen() noexcept;
 
     CClientColShape* GetColShape() { return m_pCollision; }