Changeset 6907

Timestamp:

May 17, 2010, 2:36:42 PM (14 years ago)

Author:

rgrieder

Message:

Fixed two bugs in HUDNavigation.cc and RadarViewable.

Location:

code/branches/hudelements/src

Files:

• modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• orxonox/interfaces/RadarViewable.cc (modified) (3 diffs)
• orxonox/interfaces/RadarViewable.h (modified) (2 diffs)

code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc

@@ -100 +100 @@
     {
         activeObjectListType::iterator it;
-        for( it = activeObjectList_.begin(); it!=activeObjectList_.end(); ++it )
+        for( it = activeObjectList_.begin(); it!=activeObjectList_.end(); )
         {
-            removeObject(it->first);
+            removeObject((it++)->first);
         }
         activeObjectList_.clear();

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

@@ -52 +52 @@
 
         this->uniqueId_=getUniqueNumberString();
-        this->creator_->getScene()->getRadar()->addRadarObject(this);
+        this->radar_ = this->creator_->getScene()->getRadar();
+        this->radar_->addRadarObject(this);
         this->bInitialized_ = true;
     }
@@ -60 +61 @@
     {
         if( this->bInitialized_ )
-            this->creator_->getScene()->getRadar()->removeRadarObject(this);
+            this->radar_->removeRadarObject(this);
     }
 
@@ -100 +101 @@
     void RadarViewable::settingsChanged()
     {
-        this->creator_->getScene()->getRadar()->radarObjectChanged(this);
+        this->radar_->radarObjectChanged(this);
     }
 }

code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h

@@ -37 +37 @@
 #include "util/Math.h"
 #include "core/OrxonoxClass.h"
+#include "core/SmartPtr.h"
 
 namespace orxonox
@@ -132 +133 @@
 
         //Radar
+        SmartPtr<Radar> radar_;
         float radarObjectCamouflage_;
         Shape radarObjectShape_;