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

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.cc (modified) (3 diffs)

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

@@ -50 +50 @@
     this->mode_ = TM_EventTriggerAND;
 
+    this->bFirstTick_ = true;
     this->bActive_ = false;
     this->bTriggered_ = false;
@@ -92 +93 @@
   void Trigger::tick(float dt)
   {
-
-    bool newTriggered = this->isTriggered();
+    if (this->bFirstTick_)
+    {
+      this->bFirstTick_ = false;
+      this->fireEvent(false);
+    }
+
+    bool newTriggered = this->isTriggered() ^ this->bInvertMode_;
 
     // check if new triggering event is really new
@@ -173 +179 @@
 //      this->bUpdating_ = false;
 
-      if (this->bInvertMode_)
-        return !returnval;
-      else
-        return returnval;
+      return returnval;
     }
     return true;