Changeset 7324 for code/branches/notifications/src/modules/objects/triggers/MultiTriggerContainer.h

Timestamp:

Sep 2, 2010, 10:06:51 AM (14 years ago)

Author:

dafrick

Message:

Hiding MultiTrigger behind PlayerTrigger for consistency of use.
Trying some things out with notifications.

File:

• code/branches/notifications/src/modules/objects/triggers/MultiTriggerContainer.h (modified) (3 diffs)

code/branches/notifications/src/modules/objects/triggers/MultiTriggerContainer.h

@@ -38 +38 @@
 
 #include "core/BaseObject.h"
+#include "interfaces/PlayerTrigger.h"
 
 namespace orxonox
@@ -48 +49 @@
         Damian 'Mozork' Frick
     */
-    class _ObjectsExport MultiTriggerContainer : public BaseObject
+    class _ObjectsExport MultiTriggerContainer : public BaseObject, public PlayerTrigger
     {
 
@@ -72 +73 @@
             MultiTrigger* originator_; //!< The originator.
             BaseObject* data_; //!< The data.
+
     };