Fixes #4347 - Colshape desync on parent move (#4429)

Refactor hit detection methods to use GetPosition()

Author: MohabCodeX

Server/mods/deathmatch/logic/CColCircle.cpp

@@ -35,7 +35,7 @@ CElement* CColCircle::Clone(bool* bAddEntity, CResource* pResource)
 bool CColCircle::DoHitDetection(const CVector& vecNowPosition)
 {
     // Do a simple distance check between now position and our position
-    return IsPointNearPoint2D(vecNowPosition, m_vecPosition, m_fRadius);
+    return IsPointNearPoint2D(vecNowPosition, GetPosition(), m_fRadius);
 }
 
 bool CColCircle::ReadSpecialData(const int iLine)

Server/mods/deathmatch/logic/CColCuboid.cpp

@@ -30,10 +30,11 @@ bool CColCuboid::DoHitDetection(const CVector& vecNowPosition)
 {
     // FIXME: What about radius?
 
-    // See if the now position is within our cube
-    return (vecNowPosition.fX >= m_vecPosition.fX && vecNowPosition.fX <= m_vecPosition.fX + m_vecSize.fX && vecNowPosition.fY >= m_vecPosition.fY &&
-            vecNowPosition.fY <= m_vecPosition.fY + m_vecSize.fY && vecNowPosition.fZ >= m_vecPosition.fZ &&
-            vecNowPosition.fZ <= m_vecPosition.fZ + m_vecSize.fZ);
+    // See if the now position is within our cube    
+    const CVector& vecPosition = GetPosition();
+    return (vecNowPosition.fX >= vecPosition.fX && vecNowPosition.fX <= vecPosition.fX + m_vecSize.fX && vecNowPosition.fY >= vecPosition.fY &&
+            vecNowPosition.fY <= vecPosition.fY + m_vecSize.fY && vecNowPosition.fZ >= vecPosition.fZ &&
+            vecNowPosition.fZ <= vecPosition.fZ + m_vecSize.fZ);
 }
 
 bool CColCuboid::ReadSpecialData(const int iLine)

Server/mods/deathmatch/logic/CColPolygon.cpp

@@ -160,8 +160,9 @@ void CColPolygon::CalculateRadius(const CVector2D& vecPoint)
 
 bool CColPolygon::IsInBounds(CVector vecPoint)
 {
-    float fDistanceX = vecPoint.fX - m_vecPosition.fX;
-    float fDistanceY = vecPoint.fY - m_vecPosition.fY;
+    const CVector& vecPosition = GetPosition();
+    float fDistanceX = vecPoint.fX - vecPosition.fX;
+    float fDistanceY = vecPoint.fY - vecPosition.fY;
 
     float fDist = sqrt(fDistanceX * fDistanceX + fDistanceY * fDistanceY);
 

Server/mods/deathmatch/logic/CColRectangle.cpp

@@ -34,8 +34,9 @@ bool CColRectangle::DoHitDetection(const CVector& vecNowPosition)
     // FIXME: What about radius?
 
     // See if the now position is within our cube
-    return (vecNowPosition.fX >= m_vecPosition.fX && vecNowPosition.fX <= m_vecPosition.fX + m_vecSize.fX && vecNowPosition.fY >= m_vecPosition.fY &&
-            vecNowPosition.fY <= m_vecPosition.fY + m_vecSize.fY);
+    const CVector& vecPosition = GetPosition();
+    return (vecNowPosition.fX >= vecPosition.fX && vecNowPosition.fX <= vecPosition.fX + m_vecSize.fX && vecNowPosition.fY >= vecPosition.fY &&
+            vecNowPosition.fY <= vecPosition.fY + m_vecSize.fY);
 }
 
 bool CColRectangle::ReadSpecialData(const int iLine)

Server/mods/deathmatch/logic/CColSphere.cpp

@@ -30,7 +30,7 @@ CElement* CColSphere::Clone(bool* bAddEntity, CResource* pResource)
 bool CColSphere::DoHitDetection(const CVector& vecNowPosition)
 {
     // Do a simple distance check between now position and our position
-    return IsPointNearPoint3D(vecNowPosition, m_vecPosition, m_fRadius);
+    return IsPointNearPoint3D(vecNowPosition, GetPosition(), m_fRadius);
 }
 
 bool CColSphere::ReadSpecialData(const int iLine)

Server/mods/deathmatch/logic/CColTube.cpp

@@ -32,8 +32,9 @@ bool CColTube::DoHitDetection(const CVector& vecNowPosition)
     // FIXME: What about radius in height?
 
     // First see if we're within the circle. Then see if we're within its height
-    return (IsPointNearPoint2D(vecNowPosition, m_vecPosition, m_fRadius) && vecNowPosition.fZ >= m_vecPosition.fZ &&
-            vecNowPosition.fZ <= m_vecPosition.fZ + m_fHeight);
+    const CVector& vecPosition = GetPosition();
+    return (IsPointNearPoint2D(vecNowPosition, vecPosition, m_fRadius) && vecNowPosition.fZ >= vecPosition.fZ &&
+            vecNowPosition.fZ <= vecPosition.fZ + m_fHeight);
 }
 
 bool CColTube::ReadSpecialData(const int iLine)