[Orxonox-commit 2022] r6739 - code/branches/gamestates2/src/orxonox/gamestates

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-16 12:24:56 +0200 (Fri, 16 Apr 2010)
New Revision: 6739

Modified:
   code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc
Log:
Applied background image changes to GSMainMenu.cc

Modified: code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc	2010-04-16 10:22:52 UTC (rev 6738)
+++ code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc	2010-04-16 10:24:56 UTC (rev 6739)
@@ -86,8 +86,7 @@
         // show main menu
         GUIManager::getInstance().showGUI("MainMenu", true);
         GUIManager::getInstance().setCamera(this->camera_);
-        GUIManager::getInstance().setBackground("MainMenuBackground");
-//         GUIManager::getInstance().setBackground("");
+        GUIManager::getInstance().setBackgroundImage("MainMenuBackground", "Background");
         GraphicsManager::getInstance().setCamera(this->camera_);
 
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startStandalone), "startGame"));
@@ -121,7 +120,7 @@
         //InputManager::getInstance().leaveState("mainMenu");
 
         GUIManager::getInstance().setCamera(0);
-        GUIManager::getInstance().setBackground("");
+        GUIManager::getInstance().setBackgroundImage("");
         GUIManager::hideGUI("MainMenu");
         GraphicsManager::getInstance().setCamera(0);
     }