Ticket #3334: t3334_precise_territory_radius_v3.patch

source/simulation2/components/CCmpTerritoryInfluence.cpp

@@ -18 +18 @@
 #include "precompiled.h"
 
 #include "simulation2/system/Component.h"
 #include "ICmpTerritoryInfluence.h"
 
+#include "ps/CLogger.h"
 #include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpValueModificationManager.h"
 
 class CCmpTerritoryInfluence : public ICmpTerritoryInfluence
@@ -33 +34 @@
 
     DEFAULT_COMPONENT_ALLOCATOR(TerritoryInfluence)
 
     bool m_Root;
     u16 m_Weight;
-    u32 m_Radius;
+    u16 m_Radius;
 
     static std::string GetSchema()
     {
         return
             "<element name='Root'>"
@@ -47 +48 @@
                 "<data type='nonNegativeInteger'>"
                     "<param name='maxInclusive'>65535</param>" // Max u16 value
                 "</data>"
             "</element>"
             "<element name='Radius'>"
-                "<data type='nonNegativeInteger'/>"
+                "<data type='nonNegativeInteger'>"
+                    "<param name='maxInclusive'>65535</param>" // Max u16 value
+                "</data>"
             "</element>";
     }
 
     virtual void Init(const CParamNode& paramNode)
     {
         m_Root = paramNode.GetChild("Root").ToBool();
         m_Weight = (u16)paramNode.GetChild("Weight").ToInt();
-        m_Radius = paramNode.GetChild("Radius").ToInt();
+        m_Radius = (u16)paramNode.GetChild("Radius").ToInt();
     }
 
     virtual void Deinit()
     {
     }
@@ -81 +84 @@
     virtual u16 GetWeight()
     {
         return m_Weight;
     }
 
-    virtual u32 GetRadius()
+    virtual u16 GetRadius()
     {
         CmpPtr<ICmpValueModificationManager> cmpValueModificationManager(GetSystemEntity());
         if (!cmpValueModificationManager)
             return m_Radius;
 
         u32 newRadius = cmpValueModificationManager->ApplyModifications(L"TerritoryInfluence/Radius", m_Radius, GetEntityId());
-        return newRadius;
+
+        // should be < 1000
+        if (newRadius > std::numeric_limits<u16>::max())
+        {
+            newRadius = std::numeric_limits<u16>::max();
+            LOGWARNING("Territory radius overflow for entity ID %d", GetEntityId());
+        }
+
+        return (u16) newRadius;
     }
 };
 
 REGISTER_COMPONENT_TYPE(TerritoryInfluence)

source/simulation2/components/CCmpTerritoryManager.cpp

@@ -438 +438 @@
         {
             CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), ent);
             if (!cmpPosition || !cmpPosition->IsInWorld())
                 continue;
 
+            // Multiply with 2^8 to improve precision
             CmpPtr<ICmpTerritoryInfluence> cmpTerritoryInfluence(GetSimContext(), ent);
             u32 weight = cmpTerritoryInfluence->GetWeight();
-            u32 radius = cmpTerritoryInfluence->GetRadius() / (Pathfinding::NAVCELL_SIZE * NAVCELLS_PER_TERRITORY_TILE).ToInt_RoundToNegInfinity();
+            u32 radius = ((u32) cmpTerritoryInfluence->GetRadius() << 8) / (Pathfinding::NAVCELL_SIZE * NAVCELLS_PER_TERRITORY_TILE).ToInt_RoundToNegInfinity();
+
             if (weight == 0 || radius == 0)
                 continue;
-            u32 falloff = weight / radius;
+
+            u32 falloff = (weight << 8) / radius;
 
             CFixedVector2D pos = cmpPosition->GetPosition2D();
             u16 i, j;
             NearestTerritoryTile(pos.X, pos.Y, i, j, tilesW, tilesH);
 

source/simulation2/components/ICmpTerritoryInfluence.h

@@ -25 +25 @@
 public:
     virtual bool IsRoot() = 0;
 
     virtual u16 GetWeight() = 0;
 
-    virtual u32 GetRadius() = 0;
+    virtual u16 GetRadius() = 0;
 
     DECLARE_INTERFACE_TYPE(TerritoryInfluence)
 };
 
 #endif // INCLUDED_ICMPTERRITORYINFLUENCE