Ticket #3107: t3107_bugfix_a18.patch

source/simulation2/components/CCmpRangeManager.cpp

@@ -1601 +1601 @@
 
     void UpdateVisibilityData()
     {
         PROFILE("UpdateVisibilityData");
         
+        if (m_GlobalVisibilityUpdate)
+            m_ModifiedEntities.clear();
+
         for (i32 n = 0; n < m_LosTilesPerSide * m_LosTilesPerSide; ++n)
         {
             for (player_id_t player = 1; player < MAX_LOS_PLAYER_ID + 1; ++player)
             {
                 if (IsVisibilityDirty(m_DirtyVisibility[n], player) || m_GlobalPlayerVisibilityUpdate[player-1] == 1 || m_GlobalVisibilityUpdate)
@@ -1616 +1619 @@
             m_DirtyVisibility[n] = 0;
         }
 
         std::fill(m_GlobalPlayerVisibilityUpdate.begin(), m_GlobalPlayerVisibilityUpdate.end(), 0);
 
-        // Don't bother updating modified entities if the update was global
-        if (!m_GlobalVisibilityUpdate)
+        m_GlobalVisibilityUpdate = false;
+
+        // Calling UpdateVisibility can modify m_ModifiedEntities, so be careful
+        // Infinite loops could be triggered by feedback between entities and their mirages
+        int check = 0;
+        while (!m_ModifiedEntities.empty())
         {
-            for (auto& ent : m_ModifiedEntities)
-                UpdateVisibility(ent);
+            ++check;
+            ENSURE(check < 1000 && "Possible infinite loop in UpdateVisibilityData");
+            entity_id_t ent = m_ModifiedEntities.back();
+            m_ModifiedEntities.pop_back();
+            UpdateVisibility(ent);
         }
-
-        m_ModifiedEntities.clear();
-        m_GlobalVisibilityUpdate = false;
     }
 
     virtual void RequestVisibilityUpdate(entity_id_t ent)
     {
         if (std::find(m_ModifiedEntities.begin(), m_ModifiedEntities.end(), ent) == m_ModifiedEntities.end())