[Orxonox-commit 2372] r7087 - code/branches/presentation3/src/modules/overlays/hud

landauf at orxonox.net landauf at orxonox.net
Wed Jun 2 19:51:15 CEST 2010


Author: landauf
Date: 2010-06-02 19:51:14 +0200 (Wed, 02 Jun 2010)
New Revision: 7087

Modified:
   code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc
Log:
quick fix in HUDNavigation: If a Pawn becomes invisible and gets destroyed, it wasn't removed from the list of objects in HUDNavigation, which leads to a crash.
Now it is always removed, but this doesn't fix the whole problem of changing the visibility.

Modified: code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc	2010-06-02 16:47:57 UTC (rev 7086)
+++ code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc	2010-06-02 17:51:14 UTC (rev 7087)
@@ -353,9 +353,6 @@
 
 void HUDNavigation::removeObject ( RadarViewable* viewable )
 {
-    if( showObject(viewable)==false )
-        return;
-
     ObjectMap::iterator it = activeObjectList_.find ( viewable );
 
     if ( activeObjectList_.find ( viewable ) != activeObjectList_.end() )
@@ -372,10 +369,6 @@
 
     }
 
-
-    else
-        COUT ( 2 ) << "Warning, HUDNavigation: Attempting to remove non-existent object" << std::endl;
-
     for ( sortedList::iterator listIt = sortedObjectList_.begin(); listIt != sortedObjectList_.end(); ++listIt )
     {
         if ( (listIt->first) == viewable )




More information about the Orxonox-commit mailing list