Changeset 10559 for code/branches/core7/src/modules/objects/triggers/DistanceMultiTrigger.h

Timestamp:

Aug 29, 2015, 6:55:25 PM (9 years ago)

Author:

landauf

Message:

these two classes used pointers to weakptrs - why? just use normal weakptrs, that makes more sense

File:

• code/branches/core7/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) (2 diffs)

code/branches/core7/src/modules/objects/triggers/DistanceMultiTrigger.h

@@ -140 +140 @@
 
             bool addToRange(WorldEntity* entity); // Add a given entity to the entities, that currently are in range of the DistanceMultiTrigger.
-            bool removeFromRange(WorldEntity* entity); // Remove a given entity from the set of entities, that currently are in range of the DistanceMultiTrigger.
 
         private:
@@ -154 +153 @@
             ClassTreeMask beaconMask_; //!< A mask, that only accepts DistanceTriggerBeacons.
 
-            std::map<WorldEntity*, WeakPtr<WorldEntity>* > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
+            std::set<WeakPtr<WorldEntity> > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
 
     };