Changeset 6807

Timestamp:

Apr 29, 2010, 3:40:02 PM (14 years ago)

Author:

dafrick

Message:

DistanceMultiTrigger fix. Thanks to Fabian.

File:

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

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

@@ -85 +85 @@
         }
         
-        for(std::set<WorldEntity*>::iterator it = this->range_.begin(); it != this->range_.end(); it++)
+        for(std::set<WorldEntity*>::iterator it = this->range_.begin(); it != this->range_.end(); )
         {
             Vector3 distanceVec = (*it)->getWorldPosition() - this->getWorldPosition();
             if (distanceVec.length() >= this->distance_)
             {
-                if(!this->removeFromRange(*it))
+                WorldEntity* temp = *(it++);
+                if(!this->removeFromRange(temp))
                     continue;
                 
@@ -99 +100 @@
                 MultiTriggerState* state = new MultiTriggerState;
                 state->bTriggered = false;
-                state->originator = *it;
+                state->originator = temp;
                 queue->push(state);
             }
+            else
+                ++it;
         }