[Orxonox-commit 2191] r6907 - in code/branches/hudelements/src: modules/overlays/hud orxonox/interfaces

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-05-17 14:36:42 +0200 (Mon, 17 May 2010)
New Revision: 6907

Modified:
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
   code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc
   code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h
Log:
Fixed two bugs in HUDNavigation.cc and RadarViewable.

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-17 11:22:26 UTC (rev 6906)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-17 12:36:42 UTC (rev 6907)
@@ -99,9 +99,9 @@
     if (this->isInitialized())
     {
         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();
     }

Modified: code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc	2010-05-17 11:22:26 UTC (rev 6906)
+++ code/branches/hudelements/src/orxonox/interfaces/RadarViewable.cc	2010-05-17 12:36:42 UTC (rev 6907)
@@ -51,7 +51,8 @@
         RegisterRootObject(RadarViewable);
 
         this->uniqueId_=getUniqueNumberString();
-        this->creator_->getScene()->getRadar()->addRadarObject(this);
+        this->radar_ = this->creator_->getScene()->getRadar();
+        this->radar_->addRadarObject(this);
         this->bInitialized_ = true;
     }
 
@@ -59,7 +60,7 @@
     RadarViewable::~RadarViewable()
     {
         if( this->bInitialized_ )
-            this->creator_->getScene()->getRadar()->removeRadarObject(this);
+            this->radar_->removeRadarObject(this);
     }
 
 //     void RadarViewable::setRadarObjectDescription(const std::string& str)
@@ -99,6 +100,6 @@
     
     void RadarViewable::settingsChanged()
     {
-        this->creator_->getScene()->getRadar()->radarObjectChanged(this);
+        this->radar_->radarObjectChanged(this);
     }
 }

Modified: code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h	2010-05-17 11:22:26 UTC (rev 6906)
+++ code/branches/hudelements/src/orxonox/interfaces/RadarViewable.h	2010-05-17 12:36:42 UTC (rev 6907)
@@ -36,6 +36,7 @@
 
 #include "util/Math.h"
 #include "core/OrxonoxClass.h"
+#include "core/SmartPtr.h"
 
 namespace orxonox
 {
@@ -131,6 +132,7 @@
 
 
         //Radar
+        SmartPtr<Radar> radar_;
         float radarObjectCamouflage_;
         Shape radarObjectShape_;
         std::string radarObjectDescription_;