Changeset 8371 for code/branches/tutoriallevel2/src/modules/objects

Timestamp:

May 1, 2011, 2:43:33 PM (14 years ago)

Author:

dafrick

Message:

Merging tutoriallevel branch into tutoriallevel2 branch.

Location:

code/branches/tutoriallevel2

Files:

• . (modified) (1 prop)
• src/modules/objects/triggers/MultiTrigger.cc (modified) (1 diff)
• src/modules/objects/triggers/TriggerBase.h (modified) (1 diff)

code/branches/tutoriallevel2/src/modules/objects/triggers/MultiTrigger.cc

@@ -198 +198 @@
                         if(bActive ^ this->isActive(state->originator))
                         {
-
                             bool bFire = true;
 

code/branches/tutoriallevel2/src/modules/objects/triggers/TriggerBase.h

@@ -133 +133 @@
             inline int getActivations(void) const
                 { return this->remainingActivations_; }
+            /**
+            @brief Check whether the trigger has still at least one remaining activation.
+            @return Returns true if the trigger has remaining activations (i.e. the number of remaining activations is not zero).
+            */
+            inline bool hasRemainingActivations(void) const
+                { return this->remainingActivations_ > 0 || this->remainingActivations_ == INF_s; }
 
             /**