Ticket #3321: 1_TerritoryManager.patch

source/simulation2/components/CCmpTerritoryManager.cpp

@@ -86 +86 @@
     // processed flag in bit 7 (TERRITORY_PROCESSED_MASK)
     Grid<u8>* m_Territories;
 
+    // idx 0   : total passible territory cells
+    // idx n>0 : player territory counts
+    std::vector<u16> m_TerritoryCounts;
+
     // Saves the cost per tile (to stop territory on impassable tiles)
     Grid<u8>* m_CostGrid;
 
@@ -260 +264 @@
 
     void CalculateTerritories();
 
+    u8 GetTerritoryPercentage(player_id_t player);
+
     std::vector<STerritoryBoundary> ComputeBoundaries();
 
     void UpdateBoundaryLines();
@@ -498 +504 @@
             m_Territories->set(nx, nz, owner | TERRITORY_CONNECTED_MASK);
         );
     }
+
+    m_TerritoryCounts.clear();
+    m_TerritoryCounts.resize(9, 0);
+    for (u16 w = 0; w < tilesW; ++w)
+    {
+        for (u16 h = 0; h < tilesH; ++h)
+        {
+            if (m_CostGrid->get(w,h) >= m_ImpassableCost)
+                continue;
+            ++m_TerritoryCounts[0];
+
+            player_id_t owner = m_Territories->get(w,h) & TERRITORY_PLAYER_MASK;
+            if (owner > 0)  // gaia is owner 0
+                ++m_TerritoryCounts[owner];
+        }
+    }
 }
 
 std::vector<STerritoryBoundary> CCmpTerritoryManager::ComputeBoundaries()
@@ -510 +532 @@
     return CTerritoryBoundaryCalculator::ComputeBoundaries(m_Territories);
 }
 
+u8 CCmpTerritoryManager::GetTerritoryPercentage(player_id_t player)
+{
+    float result = (float)m_TerritoryCounts[player] / m_TerritoryCounts[0];
+    return (u8)floor(result * 100);
+}
+
 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;
 
+    /**
+     * Once finished, this should return the percentage of the world covered by a given
+     * player's territory
+     */
+     virtual u8 GetTerritoryPercentage(player_id_t player) = 0;
+
     DECLARE_INTERFACE_TYPE(TerritoryManager)
 };