Changeset 5727 for code/branches/libraries2/src/orxonox/interfaces/InterfaceCompilation.cc

Timestamp:

Aug 31, 2009, 9:18:17 PM (16 years ago)

Author:

landauf

Message:

PlayerTrigger is now an interface instead of a child of Trigger. DistanceTrigger inherits now from Trigger AND PlayerTrigger.

File:

• code/branches/libraries2/src/orxonox/interfaces/InterfaceCompilation.cc (modified) (3 diffs)

code/branches/libraries2/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -35 +35 @@
 #include "GametypeMessageListener.h"
 #include "PawnListener.h"
+#include "PlayerTrigger.h"
 #include "RadarListener.h"
 #include "Rewardable.h"
@@ -84 +85 @@
     Rewardable::Rewardable()
     {
-        RegisterObject(Rewardable);
+        RegisterRootObject(Rewardable);
     }
 
@@ -92 +93 @@
     NotificationListener::NotificationListener()
     {
-        RegisterObject(NotificationListener);
+        RegisterRootObject(NotificationListener);
+    }
+
+    //----------------------------
+    // PlayerTrigger
+    //----------------------------
+    PlayerTrigger::PlayerTrigger()
+    {
+        RegisterRootObject(PlayerTrigger);
+
+        this->player_ = NULL;
+        this->isForPlayer_ = true;
     }
 }