Ticket #2360: grid.diff

source/simulation2/components/CCmpTerritoryManager.cpp

@@ -451 +451 @@
             FloodFill(entityGrid, influenceGrid, openTiles, falloff);
 
             // TODO: we should do a sparse grid and only add the non-zero regions, for performance
-            for (u16 j = 0; j < entityGrid.m_H; ++j)
-                for (u16 i = 0; i < entityGrid.m_W; ++i)
-                    playerGrid.set(i, j, playerGrid.get(i, j) + entityGrid.get(i, j));
+            playerGrid.add(entityGrid);
         }
 
         playerGrids.push_back(std::make_pair(it->first, playerGrid));

source/simulation2/helpers/Grid.h

@@ -82 +82 @@
             memset(m_Data, 0, m_W*m_H*sizeof(T));
     }
 
+    void add(const Grid& g)
+    {
+#if GRID_BOUNDS_DEBUG
+        ENSURE(0 <= g.m_W && g.m_W < m_W && 0 <= g.m_H && g.m_H < m_H);
+#endif
+        for (int j=0; j < g.m_H; ++j)
+            for (int i=0; i < g.m_W; ++i)
+                m_Data[j*m_W + i] += g.m_Data[j*g.m_W + i];
+    }
+
     void set(int i, int j, const T& value)
     {
 #if GRID_BOUNDS_DEBUG