Changeset 6917 for code/branches

Timestamp:

May 17, 2010, 3:51:43 PM (15 years ago)

Author:

scurcio

Message:

final changes in struct for the objectMap

Location:

code/branches/hudelements

Files:

• data/gui/scripts/InGamePickupHUD.lua (modified) (2 diffs)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDNavigation.h (modified) (1 diff)

code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua

@@ -13 +13 @@
 
 function P:init()
-  -- wie kann man hier dynamisch neue ListBoxItems erstellen? 
-  -- wie können sich diese ListBoxItems selbst aktualisieren? <<Tickable?>>
 end
 
@@ -21 +19 @@
 
 
+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()

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

@@ -217 +217 @@
 //            aimMarker_->hide();
 
-                if (!tempRadarViewable->second.wasOutOfView__)
+                if (!tempRadarViewable->second.wasOutOfView_)
                 {
                     tempRadarViewable->second.panel_->setMaterialName("Orxonox/NavArrows");
-                    tempRadarViewable->second.wasOutOfView__ = true;
+                    tempRadarViewable->second.wasOutOfView_ = true;
                 }
 
@@ -281 +281 @@
                 {
                     tempRadarViewable->second.panel_->setMaterialName("Orxonox/NavTDC");
-                    tempRadarViewable->second.wasOutOfView__ = false;
+                    tempRadarViewable->second.wasOutOfView_ = false;
                 }
 
@@ -397 +397 @@
         activeObjectList_.erase(viewable);
     }
+   
 }
 

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

@@ -113 +113 @@
       
       Ogre::PanelOverlayElement* panel_;
-      Ogre::TextAreaOverlayElement text_;
+      Ogre::TextAreaOverlayElement* text_;
       bool outOfView_;
       bool wasOutOfView_;