Changeset 6374 for code/branches

Timestamp:

Dec 17, 2009, 11:49:25 PM (15 years ago)

Author:

rgrieder

Message:

Fixed a problem in the Shell with the command history config file type.

Location:

code/branches/presentation2/src/libraries/core

Files:

• ConfigFileManager.h (modified) (1 diff)
• Shell.cc (modified) (2 diffs)
• Shell.h (modified) (1 diff)

code/branches/presentation2/src/libraries/core/ConfigFileManager.h

@@ -52 +52 @@
         static const int Settings            = 1;
         static const int JoyStickCalibration = 2;
+        static const int CommandHistory      = 3;
 
         static const int numberOfReservedTypes = 1024;

code/branches/presentation2/src/libraries/core/Shell.cc

@@ -62 +62 @@
         this->configureInputBuffer();
 
-        // Get a config file for the command history
-        this->commandHistoryConfigFileType_ = ConfigFileManager::getInstance().getNewConfigFileType();
-        ConfigFileManager::getInstance().setFilename(this->commandHistoryConfigFileType_, "commandHistory.ini");
+        // Specify file for the command history
+        ConfigFileManager::getInstance().setFilename(ConfigFileType::CommandHistory, "commandHistory.ini");
 
         // Use a stringstream object to buffer the output
@@ -98 +97 @@
         SetConfigValue(historyOffset_, 0)
             .callback(this, &Shell::commandHistoryOffsetChanged);
-        setConfigValueGeneric(this, &commandHistory_, commandHistoryConfigFileType_, "Shell", "commandHistory_", std::vector<std::string>());
+        setConfigValueGeneric(this, &commandHistory_, ConfigFileType::CommandHistory, "Shell", "commandHistory_", std::vector<std::string>());
 
 #ifdef ORXONOX_RELEASE

code/branches/presentation2/src/libraries/core/Shell.h

@@ -158 +158 @@
             unsigned int              scrollPosition_;
             unsigned int              historyPosition_;
-            ConfigFileType            commandHistoryConfigFileType_;
 
             std::string               promptPrefix_;