Changeset 8453 for code/branches/tutoriallevel3/src/modules/objects/triggers/MultiTrigger.cc

Timestamp:

May 12, 2011, 12:31:23 AM (14 years ago)

Author:

dafrick

Message:

Merging tutoriallevel2 branch into tutoriallevel3 branch.

Location:

code/branches/tutoriallevel3

Files:

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

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

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