Changeset 3280 for code/trunk/src/core/input/KeyBinder.cc
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/core/input/KeyBinder.cc
r3196 r3280 96 96 } 97 97 98 // Get a new ConfigFileType from the ConfigFileManager99 this->configFile_ = ConfigFile Manager::getInstance().getNewConfigFileType();98 // We might not even load any bindings at all (KeyDetector for instance) 99 this->configFile_ = ConfigFileType::NoType; 100 100 101 101 // initialise joy sticks separatly to allow for reloading … … 187 187 for (unsigned int iDev = 0; iDev < numberOfJoySticks_; iDev++) 188 188 { 189 std::string deviceNumber = convertToString(iDev);189 std::string deviceNumber = multi_cast<std::string>(iDev); 190 190 // joy stick buttons 191 191 for (unsigned int i = 0; i < JoyStickButtonCode::numberOfButtons; i++) … … 249 249 if (filename.empty()) 250 250 return; 251 252 if (this->configFile_ == ConfigFileType::NoType) 253 { 254 // Get a new ConfigFileType from the ConfigFileManager 255 this->configFile_ = ConfigFileManager::getInstance().getNewConfigFileType(); 256 } 251 257 252 258 ConfigFileManager::getInstance().setFilename(this->configFile_, filename);
Note: See TracChangeset
for help on using the changeset viewer.