Ticket #4045: CCmpRangeManager.cpp.patch

CCmpRangeManager.cpp

@@ -170 +170 @@
  */
 struct EntityData
 {
-    EntityData() : visibilities(0), size(0), retainInFog(0), owner(-1), inWorld(0), flags(1), scriptedVisibility(0) { }
+    EntityData() : visibilities(0), size(0), retainInFog(0), owner(-1), inWorld(0), flags(1), scriptedVisibility(0), componentCache(NULL){}
     entity_pos_t x, z;
     entity_pos_t visionRange;
     u32 visibilities; // 2-bit visibility, per player
     u32 size;
+    SEntityComponentCache* componentCache;
     u8 retainInFog; // boolean
     i8 owner;
     u8 inWorld; // boolean
@@ -182 +183 @@
     u8 scriptedVisibility; // boolean, see ComputeLosVisibility
 };
 
-cassert(sizeof(EntityData) == 28);
+cassert(sizeof(EntityData) == 32);
 
 /**
  * Serialization helper template for Query
@@ -480 +481 @@
             if (cmpObstruction)
                 entdata.size = cmpObstruction->GetSize().ToInt_RoundToInfinity();
 
+            // Should never fail
+            entdata.componentCache = GetSimContext().GetComponentManager().LookupEntityHandle(ent).GetComponentCache();
+
             // Remember this entity
             m_EntityData.insert(ent, entdata);
             break;
@@ -1033 +1037 @@
             return false;
 
         // Ignore if it's missing the required interface
-        if (q.interface && !GetSimContext().GetComponentManager().QueryInterface(id, q.interface))
+        if (q.interface && entity.componentCache->interfaces[q.interface] == NULL)
             return false;
 
         return true;