Changeset 7829 for code/branches/tutoriallevel

Timestamp:

Jan 13, 2011, 11:43:20 PM (14 years ago)

Author:

dafrick

Message:

Fixing small bug in MultiTrigger.

Location:

code/branches/tutoriallevel/src/modules/objects/triggers

Files:

• MultiTrigger.cc (modified) (3 diffs)
• TriggerBase.h (modified) (1 diff)

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

@@ -198 +198 @@
                         if(bActive ^ this->isActive(state->originator))
                         {
-
                             bool bFire = true;
 
@@ -205 +204 @@
                             {
                                 // If the MultiTrigger has not exceeded its remaining activations.
-                                if(this->remainingActivations_ > 0)
+                                if(this->hasRemainingActivations())
                                 {
                                     this->active_.insert(state->originator);
@@ -218 +217 @@
                             {
                                 // If the MultiTrigger doesn't stay active or hasn't' exceeded its remaining activations.
-                                if(!this->getStayActive() || this->remainingActivations_ > 0)
+                                if(!this->getStayActive() || this->hasRemainingActivations())
                                     this->active_.erase(state->originator);
                                 else

code/branches/tutoriallevel/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; }
 
             /**