[Orxonox-commit 2394] r7109 - in code/branches/presentation3: data/gui/scripts src/modules/overlays/hud

[scheusso at orxonox.net]

Author: scheusso
Date: 2010-06-03 09:34:13 +0200 (Thu, 03 Jun 2010)
New Revision: 7109

Modified:
   code/branches/presentation3/data/gui/scripts/MainMenu.lua
   code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc
Log:
radarVisibility gets respected now
hide mainmenu when loading a game


Modified: code/branches/presentation3/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/presentation3/data/gui/scripts/MainMenu.lua	2010-06-03 02:48:57 UTC (rev 7108)
+++ code/branches/presentation3/data/gui/scripts/MainMenu.lua	2010-06-03 07:34:13 UTC (rev 7109)
@@ -5,6 +5,7 @@
 
 -- events for MainMenu
 function P.QuickGameTestButton_clicked(e)
+    hideAllMenuSheets()
     orxonox.execute("startGame")
 end
 

Modified: code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc	2010-06-03 02:48:57 UTC (rev 7108)
+++ code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc	2010-06-03 07:34:13 UTC (rev 7109)
@@ -394,7 +394,7 @@
     if ( rv == dynamic_cast<RadarViewable*> ( this->getOwner() ) )
         return false;
     assert( rv->getWorldEntity() );
-    if ( rv->getWorldEntity()->isVisible()==false )
+    if ( rv->getWorldEntity()->isVisible()==false || rv->getRadarVisibility()==false )
         return false;
     return true;
 }