Changeset 5935 for code/branches/pickup/src/orxonox/interfaces

Timestamp:

Oct 13, 2009, 5:05:17 PM (15 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/orxonox/interfaces/InterfaceCompilation.cc (modified) (2 diffs)
• src/orxonox/interfaces/NotificationListener.h (modified) (1 diff)
• src/orxonox/interfaces/PawnListener.h (deleted)
• src/orxonox/interfaces/RadarViewable.cc (modified) (2 diffs)

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

@@ -34 +34 @@
 
 #include "GametypeMessageListener.h"
-#include "PawnListener.h"
 #include "PlayerTrigger.h"
 #include "RadarListener.h"
@@ -51 +50 @@
     {
         RegisterRootObject(GametypeMessageListener);
-    }
-
-    //----------------------------
-    // PawnListener
-    //----------------------------
-    /**
-        @brief Constructor for the PawnListener.
-    */
-    PawnListener::PawnListener()
-    {
-        RegisterRootObject(PawnListener);
     }
 

code/branches/pickup/src/orxonox/interfaces/NotificationListener.h

@@ -45 +45 @@
 namespace orxonox
 {
+    class Notification;
+
     class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
     {

code/branches/pickup/src/orxonox/interfaces/RadarViewable.cc

@@ -38 +38 @@
 #include "worldentities/WorldEntity.h"
 #include "Radar.h"
+#include "Scene.h"
 #include "overlays/Map.h"
 
@@ -135 +136 @@
     void RadarViewable::setRadarObjectDescription(const std::string& str)
     {
-        Radar* radar = Radar::getInstancePtr();
+        Radar* radar = this->getWorldEntity()->getScene()->getRadar();
         if (radar)
             this->radarObjectShape_ = radar->addObjectDescription(str);