Changeset 2101 for code/branches/objecthierarchy/src/core/input/Button.cc

Timestamp:

Nov 2, 2008, 12:09:55 AM (16 years ago)

Author:

rgrieder

Message:

Finally managed to have a master InputState which enables:

• Console always opens
• Debug overlay toggles visibility in gui mode too

Had to change several other code:

• ConfigFileManager uses special class instead of enum for ConfigFileType
• You can add an arbitrary config file and get the ConfigFileType
• ConfigFileManager is an Ogre singleton too. Created in Main.cc
• CommandLineArgument "optionsFile" specifies another file for command line arguments
• CommandLineArgument "settingsFile" declares the file used for settings (orxonox.ini)
• changed all fileNames to filenames
• "Loaded config file blah" now uses COUT(3) instead of COUT(0)
• fixed a bug in ConfigFileManager::load() that cause orxonox.ini to double its size after every call

File:

• code/branches/objecthierarchy/src/core/input/Button.cc (modified) (1 diff)

code/branches/objecthierarchy/src/core/input/Button.cc

@@ -82 +82 @@
     }
 
-    void Button::readConfigValue()
+    void Button::readConfigValue(ConfigFileType configFile)
     {
         // create/get ConfigValueContainer
         if (!configContainer_)
         {
-            configContainer_ = new ConfigValueContainer(CFT_Keybindings, 0, groupName_, name_, "", name_);
+            configContainer_ = new ConfigValueContainer(configFile, 0, groupName_, name_, "", name_);
             configContainer_->callback(this, &Button::parse);
         }