Changeset 2690 for code/branches/buildsystem3/src/orxonox/gamestates
- Timestamp:
- Feb 23, 2009, 8:57:42 PM (15 years ago)
- Location:
- code/branches/buildsystem3/src/orxonox/gamestates
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.cc
r2687 r2690 107 107 SetConfigValue(ogreLogLevelCritical_, 2) 108 108 .description("Corresponding orxonox debug level for ogre Critical"); 109 SetConfigValue(defaultMasterKeybindings_, "def_masterKeybindings.ini")110 .description("Filename of default master keybindings.");111 109 } 112 110 … … 148 146 // Configure master input state with a KeyBinder 149 147 masterKeyBinder_ = new KeyBinder(); 150 masterKeyBinder_->loadBindings("masterKeybindings.ini" , defaultMasterKeybindings_);148 masterKeyBinder_->loadBindings("masterKeybindings.ini"); 151 149 inputManager_->getMasterInputState()->addKeyHandler(masterKeyBinder_); 152 150 -
code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.h
r2664 r2690 105 105 int ogreLogLevelNormal_; //!< Corresponding Orxonx debug level for LL_NORMAL 106 106 int ogreLogLevelCritical_; //!< Corresponding Orxonx debug level for LL_CRITICAL 107 std::string defaultMasterKeybindings_; //!< Filename of default master keybindings.108 107 109 108 // console commands -
code/branches/buildsystem3/src/orxonox/gamestates/GSLevel.cc
r2685 r2690 75 75 { 76 76 SetConfigValue(keyDetectorCallbackCode_, "KeybindBindingStringKeyName="); 77 SetConfigValue(defaultKeybindings_, "def_keybindings.ini")78 .description("Filename of default keybindings.");79 77 } 80 78 … … 85 83 inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game", 20); 86 84 keyBinder_ = new KeyBinder(); 87 keyBinder_->loadBindings("keybindings.ini" , defaultKeybindings_);85 keyBinder_->loadBindings("keybindings.ini"); 88 86 inputState_->setHandler(keyBinder_); 89 87 -
code/branches/buildsystem3/src/orxonox/gamestates/GSLevel.h
r2662 r2690 66 66 //##### ConfigValues ##### 67 67 std::string keyDetectorCallbackCode_; 68 //! Filename of default keybindings.69 std::string defaultKeybindings_;70 68 71 69 // console commands
Note: See TracChangeset
for help on using the changeset viewer.