Changeset 2690 for code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.cc

Timestamp:

Feb 23, 2009, 8:57:42 PM (15 years ago)

Author:

rgrieder

Message:

• Moved def_keybindings to media repository in folder defaultConfig
• If you have a better name for that folder, you're welcome
• the "def_" prefix has been removed
• ConfigFileManager now looks for a file in media/defaultConfig with the same name if the config file does not exist yet
• No file gets written while only loading
• Removed hacky GCC 3 warning code for each library and instead just put "Wno-sign-compare" to the GCC 3 flags (that will remove all boost::filesystem warnings)
• ogre.cfg still remains on tardis for the development build (not install though)

File:

• code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.cc (modified) (2 diffs)

code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.cc

@@ -107 +107 @@
         SetConfigValue(ogreLogLevelCritical_, 2)
             .description("Corresponding orxonox debug level for ogre Critical");
-        SetConfigValue(defaultMasterKeybindings_, "def_masterKeybindings.ini")
-            .description("Filename of default master keybindings.");
     }
 
@@ -148 +146 @@
         // Configure master input state with a KeyBinder
         masterKeyBinder_ = new KeyBinder();
-        masterKeyBinder_->loadBindings("masterKeybindings.ini", defaultMasterKeybindings_);
+        masterKeyBinder_->loadBindings("masterKeybindings.ini");
         inputManager_->getMasterInputState()->addKeyHandler(masterKeyBinder_);