Changeset 8193

Timestamp:

Apr 6, 2011, 11:12:38 AM (14 years ago)

Author:

dafrick

Message:

Resolving bug in MultiTrigger.

Location:

code/trunk/src/modules/objects/triggers

Files:

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

code/trunk/src/modules/objects/triggers/MultiTrigger.cc

@@ -116 +116 @@
         }
 
-        // Check if the object is active (this is NOT MultiTrigger::isActive()!)
+        // Check if the object is active (this is NOT MultiTrigger::isActive()!), it is whether the MultiTrigger actually does anything, ever.
         if (!this->BaseObject::isActive())
             return;
@@ -205 +205 @@
                             {
                                 // If the MultiTrigger has not exceeded its remaining activations.
-                                if(this->remainingActivations_ > 0)
+                                if(this->hasRemainingActivations())
                                 {
                                     this->active_.insert(state->originator);
@@ -218 +218 @@
                             {
                                 // 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/trunk/src/modules/objects/triggers/TriggerBase.h

@@ -185 +185 @@
             inline void setActivations(int activations)
                 { if(activations >= 0 || activations == INF_s) this->remainingActivations_ = activations; }
+                
+            inline bool hasRemainingActivations(void)
+                { return this->remainingActivations_ == INF_s || this->remainingActivations_  > 0; }
 
             /**