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

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.h (modified) (4 diffs)

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

@@ -38 +38 @@
 
 #include "worldentities/WorldEntity.h"
-#include <set>
+#include "core/WeakPtr.h"
+#include <map>
 
 #include "MultiTrigger.h"
@@ -79 +80 @@
 
             /**
-            @brief Check whether a given entity is currently (since the last update) in range of the DistanceMultiTrigger.
-            @param entity A pointer to the entity.
-            @return Returns true if the entity is in the range.
-            */
-            inline bool inRange(WorldEntity* entity)
-                { return this->range_.find(entity) != this->range_.end(); }
-            /**
             @brief Add a given entity to the entities, that currently are in range of the DistanceMultiTrigger.
             @param entity A pointer to the entity.
@@ -91 +85 @@
             */
             inline bool addToRange(WorldEntity* entity)
-                { std::pair<std::set<WorldEntity*>::iterator, bool> pair = this->range_.insert(entity); return pair.second; }
+                { std::pair<std::map<WorldEntity*, WeakPtr<WorldEntity>* >::iterator, bool> pair = this->range_.insert(std::pair<WorldEntity*, WeakPtr<WorldEntity>* >(entity, new WeakPtr<WorldEntity>(entity))); return pair.second; }
             /**
             @brief Remove a given entity from the set of entities, that currently are in range of the DistanceMultiTrigger.
@@ -98 +92 @@
             */
             inline bool removeFromRange(WorldEntity* entity)
-                { return this->range_.erase(entity) > 0; }
+                { (*this->range_.find(entity)->second)->destroy(); bool erased = this->range_.erase(entity) > 0; return erased; }
                 
         private:
             float distance_; //!< The distance at which the DistanceMultiTrigger triggers.
-            std::set<WorldEntity*> range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
+            std::map<WorldEntity*, WeakPtr<WorldEntity>* > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
         
     };