Changeset 2221 for code/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

Timestamp:

Nov 19, 2008, 11:50:03 AM (15 years ago)

Author:

dafrick

Message:

Some tweaks and solved some bugs…

File:

• code/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (4 diffs)

code/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -35 +35 @@
 #include "core/XMLPort.h"
 
+#include "orxonox/objects/worldentities/ControllableEntity.h"
+
 namespace orxonox
 {
@@ -45 +47 @@
     this->distance_ = 100;
     this->targetMask_.exclude(Class(BaseObject));
-    this->setForPlayer(false);
+    this->setForPlayer(false); //!< Normally hasn't just ControllableEntities as targets.
   }
 
@@ -83 +85 @@
   void DistanceTrigger::addTargets(const std::string& targets)
   {
-  
-    if(targets == "ControllableEntity")
+    Identifier* targetId = ClassByString(targets);
+    
+    //! Checks whether the target is (or is derived from) a ControllableEntity.
+    Identifier* controllableEntityId = Class(ControllableEntity);
+    if(targetId->isA(controllableEntityId))
     {
-        this->setForPlayer(true);
+      this->setForPlayer(true);
     }
-  
-    Identifier* targetId = ClassByString(targets);
+    
     if (!targetId)
     {
@@ -125 +129 @@
       if (distanceVec.length() < this->distance_)
       {
+        
+        //! If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity.
         if(this->isForPlayer())
         {
-            ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);
-            this->setTriggeringPlayer(player);
+          ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);
+          this->setTriggeringPlayer(player);
         }