Ticket #3271: Fix.patch

source/simulation2/components/CCmpRangeManager.cpp

@@ -1619 +1619 @@
     {
         PROFILE("UpdateVisibilityData");
 
+        // Calling UpdateVisibility can modify m_ModifiedEntities, so be careful:
+        // infinite loops could be triggered by feedback between entities and their mirages.
+        std::map<entity_id_t, u8> attempts;
+        while (!m_ModifiedEntities.empty())
+        {
+            entity_id_t ent = m_ModifiedEntities.back();
+            m_ModifiedEntities.pop_back();
+
+            ++attempts[ent];
+            ENSURE(attempts[ent] < 100 && "Infinite loop in UpdateVisibilityData");
+
+            UpdateVisibility(ent);
+        }
+        
         for (i32 n = 0; n < m_LosTilesPerSide * m_LosTilesPerSide; ++n)
         {
             for (player_id_t player = 1; player < MAX_LOS_PLAYER_ID + 1; ++player)
@@ -1634 +1648 @@
 
         std::fill(m_GlobalPlayerVisibilityUpdate.begin(), m_GlobalPlayerVisibilityUpdate.end(), 0);
         m_GlobalVisibilityUpdate = false;
-
-        // Calling UpdateVisibility can modify m_ModifiedEntities, so be careful:
-        // infinite loops could be triggered by feedback between entities and their mirages.
-        std::map<entity_id_t, u8> attempts;
-        while (!m_ModifiedEntities.empty())
-        {
-            entity_id_t ent = m_ModifiedEntities.back();
-            m_ModifiedEntities.pop_back();
-
-            ++attempts[ent];
-            ENSURE(attempts[ent] < 100 && "Infinite loop in UpdateVisibilityData");
-
-            UpdateVisibility(ent);
         }
-    }
 
     virtual void RequestVisibilityUpdate(entity_id_t ent)
     {