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

Timestamp:

Feb 15, 2012, 11:51:58 PM (13 years ago)

Author:

jo

Message:

Merging presentation2011 branch to trunk. Please check for possible bugs.

Location:

code/trunk

Files:

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

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

@@ -91 +91 @@
     @ingroup MultiTrigger
     */
-    class _ObjectsExport DistanceMultiTrigger : public MultiTrigger
+    class _ObjectsExport DistanceMultiTrigger : public MultiTrigger 
     {
 

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

@@ -157 +157 @@
             bool isTriggered(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is triggered for a given object.
 
-            void fire(bool status, BaseObject* originator = NULL);  //!< Helper method. Creates an Event for the given status and originator and fires it.
+            virtual void fire(bool status, BaseObject* originator = NULL);  //!< Helper method. Creates an Event for the given status and originator and fires it.
             void broadcast(bool status); //!< Helper method. Broadcasts an Event for every object that is a target.