Changeset 6860 for code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc

Timestamp:

May 6, 2010, 4:01:25 PM (14 years ago)

Author:

dafrick

Message:

Resolved bug in DistanceMultiTrigger, that caused a segfault, when an object in range of the trigger was destroyed.

File:

• code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) (3 diffs)

code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -86 +86 @@
 
         // Check for objects that were in range but no longer are. Iterate through all objects, that are in range.
-        for(std::set<WorldEntity*>::iterator it = this->range_.begin(); it != this->range_.end(); )
+        for(std::map<WorldEntity*, WeakPtr<WorldEntity>* >::iterator it = this->range_.begin(); it != this->range_.end(); )
         {
-            Vector3 distanceVec = (*it)->getWorldPosition() - this->getWorldPosition();
+            WorldEntity* entity = it->second->get();
+            WorldEntity* key = it->first;
+            if(entity == NULL)
+            {
+                it++;
+                this->removeFromRange(key);
+                continue;
+            }
+            
+            Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
             // If the object is no longer in range.
             if (distanceVec.length() > this->distance_)
             {
-                WorldEntity* temp = *(it++);
-                if(!this->removeFromRange(temp))
+                if(!this->removeFromRange(entity))
                     continue;
 
@@ -103 +111 @@
                 MultiTriggerState* state = new MultiTriggerState;
                 state->bTriggered = false;
-                state->originator = temp;
+                state->originator = entity;
                 queue->push(state);
             }
@@ -113 +121 @@
         for(ClassTreeMaskObjectIterator it = targetMask.begin(); it != targetMask.end(); ++it)
         {
-            WorldEntity* entity = orxonox_cast<WorldEntity*>(*it);
-            if (entity == NULL || this->inRange(entity)) //If the object is no WorldEntity or is already in range.
+            WorldEntity* entity = static_cast<WorldEntity*>(*it);
+            if (entity == NULL) //If the object is no WorldEntity or is already in range.
                 continue;