Ticket #3271: Fix.2.patch

source/simulation2/components/CCmpRangeManager.cpp

@@ -326 +326 @@
     // Cache for visibility tracking (not serialized)
     i32 m_LosTilesPerSide;
     bool m_GlobalVisibilityUpdate;
-    std::vector<u8> m_GlobalPlayerVisibilityUpdate;
+    std::vector<bool> m_GlobalPlayerVisibilityUpdate;
     std::vector<u16> m_DirtyVisibility;
     std::vector<std::set<entity_id_t> > m_LosTiles;
     // List of entities that must be updated, regardless of the status of their tile
@@ -382 +382 @@
 
         m_LosCircular = false;
         m_TerrainVerticesPerSide = 0;
+        
+        m_GlobalPlayerVisibilityUpdate.resize(MAX_LOS_PLAYER_ID);
+
     }
 
     virtual void Deinit()
@@ -406 +409 @@
 
         SerializeVector<SerializeU32_Unbounded>()(serialize, "modified entities", m_ModifiedEntities);
 
+        serialize.Bool("global visibility update", m_GlobalVisibilityUpdate);
+        SerializeVector<SerializeBool>()(serialize, "global visibility player update",m_GlobalPlayerVisibilityUpdate);
+
         // We don't serialize m_Subdivision, m_LosPlayerCounts or m_LosTiles
         // since they can be recomputed from the entity data when deserializing;
         // m_LosState must be serialized since it depends on the history of exploration
@@ -720 +726 @@
         m_DirtyVisibility.resize(m_LosTilesPerSide*m_LosTilesPerSide);
         m_LosTiles.clear();
         m_LosTiles.resize(m_LosTilesPerSide*m_LosTilesPerSide);
-        m_GlobalVisibilityUpdate = true;
-        m_GlobalPlayerVisibilityUpdate.clear();
-        m_GlobalPlayerVisibilityUpdate.resize(MAX_LOS_PLAYER_ID);
 
         for (EntityMap<EntityData>::const_iterator it = m_EntityData.begin(); it != m_EntityData.end(); ++it)
         {
@@ -1619 +1622 @@
     {
         PROFILE("UpdateVisibilityData");
 
+        for (player_id_t player = 1; player < MAX_LOS_PLAYER_ID + 1; ++player)
+        {
         for (i32 n = 0; n < m_LosTilesPerSide * m_LosTilesPerSide; ++n)
         {
-            for (player_id_t player = 1; player < MAX_LOS_PLAYER_ID + 1; ++player)
+                if (m_GlobalPlayerVisibilityUpdate[player-1]|| m_GlobalVisibilityUpdate)
             {
-                if (IsVisibilityDirty(m_DirtyVisibility[n], player) || m_GlobalPlayerVisibilityUpdate[player-1] == 1 || m_GlobalVisibilityUpdate)
+                    for (const entity_id_t& ent : m_LosTiles[n])
                 {
-                    for (const entity_id_t& ent : m_LosTiles[n])
+                        if (std::find(m_ModifiedEntities.begin(), m_ModifiedEntities.end(), ent) != m_ModifiedEntities.end())
+                        {
+                                continue;
+                        }
                         UpdateVisibility(ent, player);
                 }
             }
+                else if (IsVisibilityDirty(m_DirtyVisibility[n], player))
+                    for (const entity_id_t& ent : m_LosTiles[n])
+                        UpdateVisibility(ent, player);
             m_DirtyVisibility[n] = 0;
         }
+        }
 
-        std::fill(m_GlobalPlayerVisibilityUpdate.begin(), m_GlobalPlayerVisibilityUpdate.end(), 0);
+        std::fill(m_GlobalPlayerVisibilityUpdate.begin(), m_GlobalPlayerVisibilityUpdate.end(), false);
         m_GlobalVisibilityUpdate = false;
 
         // Calling UpdateVisibility can modify m_ModifiedEntities, so be careful:
@@ -1670 +1682 @@
 
         itEnts->second.visibilities = (itEnts->second.visibilities & ~(0x3 << 2 * (player - 1))) | (newVis << 2 * (player - 1));
 
+        printf("%i %i %i %i",player, ent, oldVis, newVis);
         CMessageVisibilityChanged msg(player, ent, oldVis, newVis);
         GetSimContext().GetComponentManager().PostMessage(ent, msg);
     }
@@ -1731 +1744 @@
                 modified = true;
 
         if (modified && (size_t)player <= m_GlobalPlayerVisibilityUpdate.size())
-            m_GlobalPlayerVisibilityUpdate[player-1] = 1;
+            m_GlobalPlayerVisibilityUpdate[player-1] = true;
     }
 
     virtual u32 GetSharedLosMask(player_id_t player)