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

Timestamp:

Nov 12, 2008, 3:32:33 PM (15 years ago)

Author:

dafrick

Message:

Even more trigger stuff. Sorry for the spam…

File:

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

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

@@ -45 +45 @@
     this->distance_ = 100;
     this->targetMask_.exclude(Class(BaseObject));
-    this->player_ = NULL;
+    this->setForPlayer(false);
   }
 
@@ -83 +83 @@
   void DistanceTrigger::addTargets(const std::string& targets)
   {
+  
+    if(targets == "ControllableEntity")
+    {
+        this->setForPlayer(true);
+    }
+  
     Identifier* targetId = ClassByString(targets);
     if (!targetId)
@@ -119 +125 @@
       if (distanceVec.length() < this->distance_)
       {
-        this->player_ = dynamic_cast<ControllableEntity*>(entity);
+        if(this->isForPlayer())
+        {
+            ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);
+            this->setTriggeringPlayer(player);
+        }
+        
         return true;
       }
     }
     return false;
-
-  }
-  
-  ControllableEntity* DistanceTrigger::getTriggeringPlayer(void) const
-  {
-    return this->player_;
   }