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

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/Trigger.cc (modified) (2 diffs)

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

@@ -58 +58 @@
     this->bSwitch_ = false;
     this->bStayActive_ = false;
-    this->delay_ = 0.0;
+    this->delay_ = 0.0f;
+    this->remainingTime_ = 0.0f;
+    this->timeSinceLastEvent_ = 0.0f;
     this->remainingActivations_ = -1;
 
@@ -98 +100 @@
       this->fireEvent(false);
     }
+
+    // Check if the object is active (this is NOT Trigger::isActive()!)
+    if (!this->BaseObject::isActive())
+        return;
 
     bool newTriggered = this->isTriggered() ^ this->bInvertMode_;