Changeset 8457 for code/trunk/src/modules/objects

Timestamp:

May 12, 2011, 1:51:18 PM (13 years ago)

Author:

FelixSchulthess

Message:

merged portals branch into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/triggers/MultiTrigger.h (modified) (2 diffs)

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

@@ -146 +146 @@
             inline bool isTarget(BaseObject* target)
                 { if(target == NULL) return true; else return targetMask_.isIncluded(target->getIdentifier()); }
+                
+            void addTarget(const std::string& targets); //!< Add some target to the MultiTrigger.
 
         protected:
@@ -158 +160 @@
             void broadcast(bool status); //!< Helper method. Broadcasts an Event for every object that is a target.
 
-            void addTarget(const std::string& targets); //!< Add some target to the MultiTrigger.
-            void removeTarget(const std::string& targets); //!< Remove some target from the MultiTrigger.
+            void removeTarget(const std::string& target); //!< Remove some target from the MultiTrigger.
 
             /**