Changeset 6024 for code/branches/menu/src/orxonox/gamestates/GSMainMenu.cc

Timestamp:

Nov 4, 2009, 2:14:53 PM (15 years ago)

Author:

scheusso

Message:

merged ingamemenu branch to menu branch

Location:

code/branches/menu

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)

code/branches/menu/src/orxonox/gamestates/GSMainMenu.cc

@@ -82 +82 @@
     {
         // show main menu
-        GUIManager::getInstance().showGUI("MainMenu");
+        GUIManager::getInstance().showGUI("MainMenu", false);
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);
@@ -113 +113 @@
 
         GUIManager::getInstance().setCamera(0);
+        GUIManager::hideGUI("MainMenu");
         GraphicsManager::getInstance().setCamera(0);
     }