Fix isInsideRadarArea() not working with negative dimensions (#157)

* Fix isElementInsideRadarArea not working when radarArea size is negative
* Fix arguments naming in RadarArea *Position methods
* Adjust copypasted signatures in comments to match the reality

Author: 4O4

Client/mods/deathmatch/logic/CClientRadarArea.h

@@ -37,10 +37,10 @@ class CClientRadarArea : public CClientEntity
     inline eClientEntityType    GetType                     ( void ) const                      { return CCLIENTRADARAREA; };
 
     inline const CVector2D&     GetPosition                 ( void ) const                      { return m_vecPosition; };
-    inline void                 GetPosition                 ( CVector2D& vecBottomLeft ) const  { vecBottomLeft = m_vecPosition; };
-    inline void                 GetPosition                 ( CVector& vecBottomLeft ) const    { vecBottomLeft = CVector ( m_vecPosition.fX, m_vecPosition.fY, 0.0f ); };
-    inline void                 SetPosition                 ( const CVector2D& vecBottomLeft )  { m_vecPosition = vecBottomLeft; };
-    inline void                 SetPosition                 ( const CVector& vecBottomLeft )    { m_vecPosition = CVector2D ( vecBottomLeft.fX, vecBottomLeft.fY ); };
+    inline void                 GetPosition                 ( CVector2D& vecPosition ) const  { vecPosition = m_vecPosition; };
+    inline void                 GetPosition                 ( CVector& vecPosition ) const    { vecPosition = CVector ( m_vecPosition.fX, m_vecPosition.fY, 0.0f ); };
+    inline void                 SetPosition                 ( const CVector2D& vecPosition )  { m_vecPosition = vecPosition; };
+    inline void                 SetPosition                 ( const CVector& vecPosition )    { m_vecPosition = CVector2D ( vecPosition.fX, vecPosition.fY ); };
 
     inline const CVector2D&     GetSize                     ( void ) const                      { return m_vecSize; };
     inline void                 GetSize                     ( CVector2D& vecSize )              { vecSize = m_vecSize; };

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4063,22 +4063,28 @@ bool CStaticFunctionDefinitions::SetRadarAreaFlashing ( CClientRadarArea* RadarA
 
 bool CStaticFunctionDefinitions::IsInsideRadarArea ( CClientRadarArea* RadarArea, CVector2D vecPosition, bool& inside )
 {
-    if ( RadarArea )
+    assert ( RadarArea );
+
+    CVector2D vecAreaPosition = RadarArea->GetPosition ();
+    CVector2D vecAreaSize = RadarArea->GetSize ();
+
+    inside = false;
+
+    // Calculate boundaries and make sure they're in ascending order,
+    // so it is always safe to start checking from the bottom-left corner
+    std::pair<float, float> fHorizontalBounds = std::minmax ( vecAreaPosition.fX, vecAreaPosition.fX + vecAreaSize.fX );
+    std::pair<float, float> fVerticalBounds = std::minmax ( vecAreaPosition.fY, vecAreaPosition.fY + vecAreaSize.fY );
+
+    // Do the calc from the bottom-left corner
+    if ( vecPosition.fX >= fHorizontalBounds.first && vecPosition.fX <= fHorizontalBounds.second )
     {
-        CVector2D vecRadarPos = RadarArea->GetPosition();
-        CVector2D vecRadarSize = RadarArea->GetSize();
-        float fMaxX = vecRadarPos.fX + vecRadarSize.fX;
-        float fMaxY = vecRadarPos.fY + vecRadarSize.fY;
-        if ( vecPosition.fX >= vecRadarPos.fX && vecPosition.fX <= fMaxX )
+        if ( vecPosition.fY >= fVerticalBounds.first && vecPosition.fY <= fVerticalBounds.second )
         {
-            if ( vecPosition.fY >= vecRadarPos.fY && vecPosition.fY <= fMaxY )
-            {
-                inside = true;
-            }
+            inside = true;
         }
-        return true;
     }
-    return false;
+
+    return true;
 }
 
 

Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp

@@ -49,7 +49,7 @@ void CLuaRadarAreaDefs::AddClass ( lua_State* luaVM )
 
 int CLuaRadarAreaDefs::CreateRadarArea ( lua_State* luaVM )
 {
-    //  radararea createRadarArea ( float leftX, float bottomY, float sizeX, float sizeY, [ int r = 255, int g = 0, int b = 0, int a = 255, element visibleTo = getRootElement() ] )
+    //  radararea createRadarArea ( float startPosX, float startPosY, float sizeX, float sizeY, [ int r = 255, int g = 0, int b = 0, int a = 255, element visibleTo = getRootElement() ] )
     CVector2D vecPosition; CVector2D vecSize; float dRed; float dGreen; float dBlue; float dAlpha;
 
     CScriptArgReader argStream ( luaVM );
@@ -146,7 +146,7 @@ int CLuaRadarAreaDefs::GetRadarAreaSize ( lua_State* luaVM )
 
 int CLuaRadarAreaDefs::OOP_GetRadarAreaSize ( lua_State* luaVM )
 {
-    //  float, float getRadarAreaSize ( radararea theRadararea )
+    //  vector2 getRadarAreaSize ( radararea theRadararea )
     CClientRadarArea* pRadarArea;
 
     CScriptArgReader argStream ( luaVM );

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -8399,19 +8399,25 @@ bool CStaticFunctionDefinitions::IsInsideRadarArea ( CRadarArea* pRadarArea, con
 {
     assert ( pRadarArea );
 
-    CVector vecTemp = pRadarArea->GetPosition ();
-    CVector2D vecSize = pRadarArea->GetSize ();
-    // Remove this line if the position of radar areas isnt in the center
-    //vecTemp -= ( CVector ( vecSize.fX, vecSize.fY, 0.0f ) * CVector ( 0.5f, 0.5f, 0.5f ) );
+    CVector vecAreaPosition = pRadarArea->GetPosition ();
+    CVector2D vecAreaSize = pRadarArea->GetSize ();
+
     bInside = false;
-    // Do the calc from the bottom left
-    if ( vecPosition.fX >= vecTemp.fX && vecPosition.fX <= ( vecTemp.fX + vecSize.fX ) )
+
+    // Calculate boundaries and make sure they're in ascending order,
+    // so it is always safe to start checking from the bottom-left corner
+    std::pair<float, float> fHorizontalBounds = std::minmax ( vecAreaPosition.fX, vecAreaPosition.fX + vecAreaSize.fX );
+    std::pair<float, float> fVerticalBounds = std::minmax ( vecAreaPosition.fY, vecAreaPosition.fY + vecAreaSize.fY );
+
+    // Do the calc from the bottom-left corner
+    if ( vecPosition.fX >= fHorizontalBounds.first && vecPosition.fX <= fHorizontalBounds.second )
     {
-        if ( vecPosition.fY >= vecTemp.fY && vecPosition.fY <= ( vecTemp.fY + vecSize.fY ) )
+        if ( vecPosition.fY >= fVerticalBounds.first && vecPosition.fY <= fVerticalBounds.second )
         {
             bInside = true;
         }
     }
+
     return true;
 }
 

Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp

@@ -53,7 +53,7 @@ void CLuaRadarAreaDefs::AddClass ( lua_State* luaVM )
 
 int CLuaRadarAreaDefs::CreateRadarArea ( lua_State* luaVM )
 {
-    //  radararea createRadarArea ( float leftX, float bottomY, float sizeX, float sizeY, [ int r = 255, int g = 0, int b = 0, int a = 255, element visibleTo = getRootElement() ] )
+    //  radararea createRadarArea ( float startPosX, float startPosY, float sizeX, float sizeY, [ int r = 255, int g = 0, int b = 0, int a = 255, element visibleTo = getRootElement() ] )
     CVector2D vecPosition; CVector2D vecSize; float dRed; float dGreen; float dBlue; float dAlpha; CElement* pVisibleTo;
 
     CScriptArgReader argStream ( luaVM );
@@ -122,7 +122,7 @@ int CLuaRadarAreaDefs::GetRadarAreaSize ( lua_State* luaVM )
 
 int CLuaRadarAreaDefs::OOP_GetRadarAreaSize ( lua_State* luaVM )
 {
-    //  float, float getRadarAreaSize ( radararea theRadararea )
+    //  vector2 getRadarAreaSize ( radararea theRadararea )
     CRadarArea* pRadarArea;
 
     CScriptArgReader argStream ( luaVM );