Changeset 9257 for code/trunk/src/orxonox/infos

Timestamp:

May 28, 2012, 12:28:44 PM (13 years ago)

Author:

landauf

Message:

renamed RVName to radarname
cast to RadarViewable instead of SpaceShip to set the name (in PlayerInfo)

File:

• code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) (5 diffs)

code/trunk/src/orxonox/infos/PlayerInfo.cc

@@ -36 +36 @@
 #include "worldentities/ControllableEntity.h"
 #include "controllers/Controller.h"
-#include "worldentities/pawns/SpaceShip.h"
+#include "interfaces/RadarViewable.h"
 
 namespace orxonox
@@ -58 +58 @@
 
         this->registerVariables();
-        
+
     }
 
@@ -154 +154 @@
         while (this->previousControllableEntity_.size() > 0)
             this->stopTemporaryControl();
-        
+
         if (this->controllableEntity_)
             this->stopControl();
@@ -172 +172 @@
 
         this->changedControllableEntity();
-                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(entity);
-        if (spaceship != NULL)
-        {
-            spaceship->setRVName(this->getName());
-        }
+
+                RadarViewable* radarviewable = orxonox_cast<RadarViewable*>(entity);
+        if (radarviewable != NULL)
+            radarviewable->setRadarName(this->getName());
     }
 
@@ -244 +243 @@
         if(this->isHumanPlayer()) // TODO: Multiplayer?
             this->controllableEntity_->destroyHud(); // HACK-ish
-        
+
 //        this->controllableEntity_ = this->previousControllableEntity_.back();
         do {