Ticket #3321: 1_TerritoryManager-v4.patch

source/simulation2/components/CCmpTerritoryManager.cpp

@@ -86 +86 @@
     // processed flag in bit 7 (TERRITORY_PROCESSED_MASK)
     Grid<u8>* m_Territories;
 
+    std::vector<u16> m_TerritoryCellCounts;
+    u16 m_TerritoryTotalPassableCellCount;
+
     // Saves the cost per tile (to stop territory on impassable tiles)
     Grid<u8>* m_CostGrid;
 
@@ -123 +126 @@
 
         m_AnimTime = 0.0;
 
+        m_TerritoryTotalPassableCellCount = 0;
+
         // Register Relax NG validator
         CXeromyces::AddValidator(g_VFS, "territorymanager", "simulation/data/territorymanager.rng");
 
@@ -260 +265 @@
 
     void CalculateTerritories();
 
+    u8 GetTerritoryPercentage(player_id_t player);
+
     std::vector<STerritoryBoundary> ComputeBoundaries();
 
     void UpdateBoundaryLines();
@@ -337 +344 @@
     int tilesH = passGrid.m_H / NAVCELLS_PER_TERRITORY_TILE;
 
     m_CostGrid = new Grid<u8>(tilesW, tilesH);
+    m_TerritoryTotalPassableCellCount = 0;
 
     for (int i = 0; i < tilesW; ++i)
     {
@@ -353 +361 @@
             else if (c & passClassUnrestricted)
                 m_CostGrid->set(i, j, 255); // off the world; use maximum cost
             else
+            {
                 m_CostGrid->set(i, j, 1);
+                ++m_TerritoryTotalPassableCellCount;
+            }
         }
     }
 }
@@ -376 +387 @@
 
     m_Territories = new Grid<u8>(tilesW, tilesH);
 
+    CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSystemEntity());
+    m_TerritoryCellCounts.clear();
+    m_TerritoryCellCounts.resize(cmpPlayerManager->GetNumPlayers(), 0);
+
     // Find all territory influence entities
     CComponentManager::InterfaceList influences = GetSimContext().GetComponentManager().GetEntitiesWithInterface(IID_TerritoryInfluence);
 
@@ -496 +511 @@
             if (m_Territories->get(nx, nz) != owner)
                 continue;
             m_Territories->set(nx, nz, owner | TERRITORY_CONNECTED_MASK);
+            if (m_CostGrid->get(nx, nz) < m_ImpassableCost)
+                ++m_TerritoryCellCounts[owner];
         );
     }
 }
@@ -510 +527 @@
     return CTerritoryBoundaryCalculator::ComputeBoundaries(m_Territories);
 }
 
+u8 CCmpTerritoryManager::GetTerritoryPercentage(player_id_t player)
+{
+    if (player <= 0 && (u8)player > m_TerritoryCellCounts.size())
+        return 0;
+
+    ENSURE(m_TerritoryTotalPassableCellCount > 0);
+    u8 percentage = (m_TerritoryCellCounts[player] * 100) / m_TerritoryTotalPassableCellCount;
+    ENSURE(percentage <= 100);
+    return percentage;
+}
+
 void CCmpTerritoryManager::UpdateBoundaryLines()
 {
     PROFILE("update boundary lines");

source/simulation2/components/ICmpTerritoryManager.cpp

@@ -26 +26 @@
 DEFINE_INTERFACE_METHOD_3("GetNeighbours", std::vector<u32>, ICmpTerritoryManager, GetNeighbours, entity_pos_t, entity_pos_t, bool)
 DEFINE_INTERFACE_METHOD_2("IsConnected", bool, ICmpTerritoryManager, IsConnected, entity_pos_t, entity_pos_t)
 DEFINE_INTERFACE_METHOD_2("SetTerritoryBlinking", void, ICmpTerritoryManager, SetTerritoryBlinking, entity_pos_t, entity_pos_t)
+DEFINE_INTERFACE_METHOD_1("GetTerritoryPercentage", u8, ICmpTerritoryManager, GetTerritoryPercentage, player_id_t)
 END_INTERFACE_WRAPPER(TerritoryManager)

source/simulation2/components/ICmpTerritoryManager.h

@@ -72 +72 @@
      */
     virtual void SetTerritoryBlinking(entity_pos_t x, entity_pos_t z) = 0;
 
+    /**
+     * Returns the percentage of the world controlled by a given player as defined by
+     * the number of territory cells the given player owns
+     */
+     virtual u8 GetTerritoryPercentage(player_id_t player) = 0;
+
     DECLARE_INTERFACE_TYPE(TerritoryManager)
 };