[Orxonox-commit 2024] r6741 - code/branches/gamestates2/src/orxonox/gamestates

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-16 12:50:52 +0200 (Fri, 16 Apr 2010)
New Revision: 6741

Modified:
   code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc
   code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h
Log:
Removed obsolete InputState from GSMainMenu.

Modified: code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc	2010-04-16 10:48:24 UTC (rev 6740)
+++ code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc	2010-04-16 10:50:52 UTC (rev 6741)
@@ -30,8 +30,6 @@
 
 #include <OgreSceneManager.h>
 
-#include "core/input/InputManager.h"
-#include "core/input/InputState.h"
 #include "core/input/KeyBinderManager.h"
 #include "core/Game.h"
 #include "core/ConsoleCommand.h"
@@ -48,14 +46,8 @@
 
     GSMainMenu::GSMainMenu(const GameStateInfo& info)
         : GameState(info)
-        , inputState_(0)
     {
         RegisterRootObject(GSMainMenu);
-        inputState_ = InputManager::getInstance().createInputState("mainMenu");
-        inputState_->setMouseExclusive(TriBool::False);
-        inputState_->setHandler(&GUIManager::getInstance());
-        inputState_->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
-        inputState_->setJoyStickHandler(&InputHandler::EMPTY);
 
         // create an empty Scene
         this->scene_ = new Scene(NULL);
@@ -75,8 +67,6 @@
         if (GameMode::playsSound())
             this->ambient_->destroy();
 
-        InputManager::getInstance().destroyState("mainMenu");
-
         this->scene_->getSceneManager()->destroyCamera(this->camera_);
         this->scene_->destroy();
     }
@@ -99,7 +89,6 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::setMainMenuSoundPath, this), "setMMSoundPath"));
 
         KeyBinderManager::getInstance().setToDefault();
-        //InputManager::getInstance().enterState("mainMenu");
 
         this->setConfigValues();
 
@@ -117,8 +106,6 @@
             this->ambient_->stop();
         }
 
-        //InputManager::getInstance().leaveState("mainMenu");
-
         GUIManager::getInstance().setCamera(0);
         GUIManager::getInstance().setBackgroundImage("");
         GUIManager::hideGUI("MainMenu");

Modified: code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h	2010-04-16 10:48:24 UTC (rev 6740)
+++ code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h	2010-04-16 10:50:52 UTC (rev 6741)
@@ -60,7 +60,6 @@
         static void startIOConsole();
 
     private:
-        InputState*       inputState_;
         Scene*            scene_;
         Ogre::Camera*     camera_;