Changeset 7324 for code/branches/notifications/src/modules/objects/triggers

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.

Location:

code/branches/notifications/src/modules/objects/triggers

Files:

• MultiTriggerContainer.cc (modified) (2 diffs)
• MultiTriggerContainer.h (modified) (3 diffs)
• Trigger.cc (modified) (1 diff)

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

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -65 +66 @@
     {
         RegisterObject(MultiTriggerContainer);
+
+        Pawn* pawn = orxonox_cast<Pawn*>(data);
+        if(pawn != NULL)
+        {
+            this->setForPlayer(true);
+            this->setTriggeringPlayer(pawn);
+        }
     }
 

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.
+
     };
 

code/branches/notifications/src/modules/objects/triggers/Trigger.cc

@@ -160 +160 @@
   void Trigger::triggered(bool bIsTriggered)
   {
-      COUT(1) << "Trigger triggered." << std::endl; //TODO: Remove debug.
     this->fireEvent(bIsTriggered);
   }