Ticket #3378: 3378_v1.patch

source/simulation2/components/CCmpTerritoryManager.cpp

@@ -389 +389 @@
 
     // Reset territory counts for all players
     CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSystemEntity());
-    if (cmpPlayerManager && cmpPlayerManager->GetNumPlayers() != m_TerritoryCellCounts.size())
+    if (cmpPlayerManager && (size_t)cmpPlayerManager->GetNumPlayers() != m_TerritoryCellCounts.size())
         m_TerritoryCellCounts.resize(cmpPlayerManager->GetNumPlayers());
     for (u16& count : m_TerritoryCellCounts)
         count = 0;
@@ -535 +535 @@
     if (player <= 0 && (size_t)player > m_TerritoryCellCounts.size())
         return 0;
 
+    // This is to prevent a problem with rejoining players, where this
+    // function was being called before territories had been recalculated
+    if (m_TerritoryTotalPassableCellCount <= 0)
+        CalculateTerritories();
     ENSURE(m_TerritoryTotalPassableCellCount > 0);
+
     u8 percentage = (m_TerritoryCellCounts[player] * 100) / m_TerritoryTotalPassableCellCount;
     ENSURE(percentage <= 100);
     return percentage;