Changeset 2193 for code/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

Timestamp:

Nov 12, 2008, 2:20:51 PM (17 years ago)

Author:

dafrick

Message:

Playing with Triggers.

File:

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

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

@@ -30 +30 @@
 #define _DistanceTrigger_H__
 
-#include "Trigger.h"
+#include "PlayerTrigger.h"
 
 #include <set>
@@ -37 +37 @@
 #include "core/BaseObject.h"
 
+#include "orxonox/objects/worldentities/ControllableEntity.h"
+
 namespace orxonox
 {
-  class _OrxonoxExport DistanceTrigger : public Trigger
+  class _OrxonoxExport DistanceTrigger : public PlayerTrigger
   {
     public:
@@ -56 +58 @@
       inline float getDistance() const
         { return this->distance_; }
+        
+        virtual ControllableEntity* getTriggeringPlayer(void) const;
 
       bool checkDistance();
@@ -66 +70 @@
       std::set<Ogre::Node*> targetSet_;
       float distance_;
+      
+      ControllableEntity* player_;
+      
   };
 }