Changeset 3327 for code/trunk/src/orxonox/gamestates/GSMainMenu.cc
- Timestamp:
- Jul 19, 2009, 5:31:02 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 merged: 3269,3271-3275,3278,3285,3290-3294,3310
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSMainMenu.cc
r3280 r3327 32 32 33 33 #include "core/input/InputManager.h" 34 #include "core/input/ SimpleInputState.h"34 #include "core/input/InputState.h" 35 35 #include "core/Game.h" 36 36 #include "core/Clock.h" … … 57 57 void GSMainMenu::activate() 58 58 { 59 inputState_ = InputManager::getInstance().createInputState <SimpleInputState>("mainMenu");59 inputState_ = InputManager::getInstance().createInputState("mainMenu"); 60 60 inputState_->setHandler(GUIManager::getInstancePtr()); 61 inputState_->setJoyStickHandler(&Input Manager::EMPTY_HANDLER);61 inputState_->setJoyStickHandler(&InputHandler::EMPTY); 62 62 63 63 // create an empty Scene … … 96 96 } 97 97 98 InputManager::getInstance(). requestEnterState("mainMenu");98 InputManager::getInstance().enterState("mainMenu"); 99 99 100 100 this->ambient_ = new SoundMainMenu(); … … 106 106 delete this->ambient_; 107 107 108 InputManager::getInstance(). requestLeaveState("mainMenu");109 InputManager::getInstance(). requestDestroyState("mainMenu");108 InputManager::getInstance().leaveState("mainMenu"); 109 InputManager::getInstance().destroyState("mainMenu"); 110 110 111 111 GUIManager::getInstance().setCamera(0);
Note: See TracChangeset
for help on using the changeset viewer.