Changeset 2071 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

Timestamp:

Oct 31, 2008, 12:56:29 AM (16 years ago)

Author:

landauf

Message:

• fixed another bug in Trigger
• added EventTrigger which listens on "trigger" events

File:

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

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

@@ -34 +34 @@
 #include <set>
 
-#include <OgreNode.h>
-
 #include "core/ClassTreeMask.h"
 #include "core/BaseObject.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
   class _OrxonoxExport DistanceTrigger : public Trigger
   {
     public:
       DistanceTrigger(BaseObject* creator);
-      ~DistanceTrigger();
+      virtual ~DistanceTrigger();
 
       virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -62 +60 @@
 
     protected:
-      bool isTriggered(TriggerMode mode);
+      virtual bool isTriggered(TriggerMode mode);
 
     private:
@@ -69 +67 @@
       float distance_;
   };
-
 }
 
-#endif /* _Trigger_H__ */
+#endif /* _DistanceTrigger_H__ */