Changeset 2069 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h

Timestamp:

Oct 30, 2008, 11:58:31 PM (16 years ago)

Author:

landauf

Message:

fixed a bug in the event system
fixed a bug in Trigger and tweaked some features

File:

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

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

@@ -35 +35 @@
 #include "OrxonoxPrereqs.h"
 
+#include "objects/Tickable.h"
 #include "objects/worldentities/PositionableEntity.h"
 #include "tools/BillboardSet.h"
@@ -47 +48 @@
   };
 
-  class _OrxonoxExport Trigger : public PositionableEntity
+  class _OrxonoxExport Trigger : public PositionableEntity, public Tickable
   {
     public:
@@ -111 +112 @@
       bool bActive_;
       bool bTriggered_;
+      bool bFirstTick_;
 
       TriggerMode mode_;