Changeset 5738 for code/trunk/src/orxonox/interfaces

Timestamp:

Sep 1, 2009, 2:03:05 AM (15 years ago)

Author:

landauf

Message:

merged libraries2 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/interfaces/InterfaceCompilation.cc (modified) (3 diffs)
• src/orxonox/interfaces/PlayerTrigger.h (copied) (copied from code/branches/libraries2/src/orxonox/interfaces/PlayerTrigger.h)
• src/orxonox/interfaces/RadarViewable.cc (modified) (1 diff)

code/trunk/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;
     }
 }

code/trunk/src/orxonox/interfaces/RadarViewable.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "tools/DynamicLines.h"
-#include "objects/worldentities/WorldEntity.h"
-#include "objects/Radar.h"
-#include "Map.h"
+#include "worldentities/WorldEntity.h"
+#include "Radar.h"
+#include "overlays/Map.h"
 
 namespace orxonox