Ticket #4658: t4658.diff

source/simulation2/components/CCmpRangeManager.cpp

@@ -1095 +1095 @@
 
             if (!query.enabled)
                 continue;
 
             CmpPtr<ICmpPosition> cmpSourcePosition(query.source);
-            if (!cmpSourcePosition || !cmpSourcePosition->IsInWorld())
+            if (!cmpSourcePosition)
                 continue;
 
             results.clear();
             results.reserve(query.lastMatch.size());
-            CFixedVector2D pos = cmpSourcePosition->GetPosition2D();
-            PerformQuery(query, results, pos);
+
+            if (cmpSourcePosition->IsInWorld())
+            {
+                CFixedVector2D pos = cmpSourcePosition->GetPosition2D();
+                PerformQuery(query, results, pos);
+            }
 
             // Compute the changes vs the last match
             added.clear();
             removed.clear();
             // Return the 'added' list sorted by distance from the entity
@@ -1115 +1119 @@
             std::set_difference(query.lastMatch.begin(), query.lastMatch.end(), results.begin(), results.end(),
                 std::back_inserter(removed));
             if (added.empty() && removed.empty())
                 continue;
 
-            std::stable_sort(added.begin(), added.end(), EntityDistanceOrdering(m_EntityData, cmpSourcePosition->GetPosition2D()));
+            if (cmpSourcePosition->IsInWorld())
+                std::stable_sort(added.begin(), added.end(), EntityDistanceOrdering(m_EntityData, cmpSourcePosition->GetPosition2D()));
+            else
+                ResetActiveQuery(it->first);
 
             messages.resize(messages.size() + 1);
             std::pair<entity_id_t, CMessageRangeUpdate>& back = messages.back();
             back.first = query.source.GetId();
             back.second.tag = it->first;