Changeset 9667 for code/trunk/src/orxonox/gamestates/GSMainMenu.cc
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSMainMenu.cc
r8858 r9667 31 31 #include <OgreSceneManager.h> 32 32 33 #include "core/ ConfigValueIncludes.h"33 #include "core/config/ConfigValueIncludes.h" 34 34 #include "core/CoreIncludes.h" 35 35 #include "core/Game.h" … … 66 66 : GameState(info) 67 67 { 68 Register RootObject(GSMainMenu);68 RegisterObject(GSMainMenu); 69 69 70 70 InputManager::getInstance().createInputState("MainMenuHackery", true, true)->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
Note: See TracChangeset
for help on using the changeset viewer.