[Orxonox-commit 2201] r6917 - in code/branches/hudelements: data/gui/scripts src/modules/overlays/hud

[scurcio at orxonox.net]

Author: scurcio
Date: 2010-05-17 15:51:43 +0200 (Mon, 17 May 2010)
New Revision: 6917

Modified:
   code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h
Log:
final changes in struct for the objectMap

Modified: code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
===================================================================
--- code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-05-17 13:50:30 UTC (rev 6916)
+++ code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-05-17 13:51:43 UTC (rev 6917)
@@ -12,14 +12,18 @@
 P.layoutString = "InGamePickupHUD.layout"
 
 function P:init()
-  -- wie kann man hier dynamisch neue ListBoxItems erstellen? 
-  -- wie können sich diese ListBoxItems selbst aktualisieren? <<Tickable?>>
 end
 
 
 -- events for ingamemenu
 
 
+function P.button_Pickup_clicked(e)
+    orxonox.Game:getInstance():popState()
+    orxonox.Game:getInstance():popState()
+    orxonox.Game:getInstance():requestState("mainmenu")
+    hideGUI("InGameMenu")
+end
 
 function P.close_button_clicked()
     hideGUI("InGamePickupHUD")

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-17 13:50:30 UTC (rev 6916)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-17 13:51:43 UTC (rev 6917)
@@ -216,10 +216,10 @@
                 // object is not in view
 //            aimMarker_->hide();
 
-                if (!tempRadarViewable->second.wasOutOfView__)
+                if (!tempRadarViewable->second.wasOutOfView_)
                 {
                     tempRadarViewable->second.panel_->setMaterialName("Orxonox/NavArrows");
-                    tempRadarViewable->second.wasOutOfView__ = true;
+                    tempRadarViewable->second.wasOutOfView_ = true;
                 }
 
 
@@ -280,7 +280,7 @@
                 if (tempRadarViewable->second.wasOutOfView_)
                 {
                     tempRadarViewable->second.panel_->setMaterialName("Orxonox/NavTDC");
-                    tempRadarViewable->second.wasOutOfView__ = false;
+                    tempRadarViewable->second.wasOutOfView_ = false;
                 }
 
                 // object is in view
@@ -396,6 +396,7 @@
 
         activeObjectList_.erase(viewable);
     }
+   
 }
 
 void HUDNavigation::changedOwner()

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h	2010-05-17 13:50:30 UTC (rev 6916)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h	2010-05-17 13:51:43 UTC (rev 6917)
@@ -112,7 +112,7 @@
     struct objectStruct{
       
       Ogre::PanelOverlayElement* panel_;
-      Ogre::TextAreaOverlayElement text_;
+      Ogre::TextAreaOverlayElement* text_;
       bool outOfView_;
       bool wasOutOfView_;