Changeset 7880 for code/trunk

Timestamp:

Feb 13, 2011, 9:52:42 PM (14 years ago)

Author:

landauf

Message:

radar doesn't abort if owner is missing
radar works with all ControllableEntities not just Pawns

Location:

code/trunk/src/modules/overlays/hud

Files:

• HUDRadar.cc (modified) (3 diffs)
• HUDRadar.h (modified) (1 diff)

code/trunk/src/modules/overlays/hud/HUDRadar.cc

@@ -38 +38 @@
 #include "core/XMLPort.h"
 #include "tools/TextureGenerator.h"
-#include "worldentities/WorldEntity.h"
-#include "worldentities/pawns/Pawn.h"
+#include "worldentities/ControllableEntity.h"
 #include "Scene.h"
 #include "Radar.h"
@@ -144 +143 @@
         // Make sure the owner of the radar was defined
         if( !this->owner_ )
-        {
-            CCOUT(0) << "No owner defined" << std::endl;
-            assert(0);
-        }
+            return;
 
         this->marker_->hide();      // in case that no object is in focus
@@ -190 +186 @@
     void HUDRadar::changedOwner()
     {
-    SUPER(HUDRadar, changedOwner);
+        SUPER(HUDRadar, changedOwner);
 
-    this->owner_ = orxonox_cast<Pawn*>(this->getOwner());
-    assert(this->radarObjects_.size()==0);
-    this->gatherObjects();
+        this->owner_ = orxonox_cast<ControllableEntity*>(this->getOwner());
+        assert(this->radarObjects_.size() == 0);
+        this->gatherObjects();
+    }
 }
-}

code/trunk/src/modules/overlays/hud/HUDRadar.h

@@ -84 +84 @@
         float sensitivity_;
 
-        Pawn* owner_;
+        ControllableEntity* owner_;
     };
 }