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

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

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/trunk/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/trunk/src/orxonox/interfaces/NotificationListener.h

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

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