Changeset 10624 for code/trunk/src/libraries/core/input/KeyBinder.cc
- Timestamp:
- Oct 4, 2015, 9:12:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
-
code/trunk/src/libraries/core/input/KeyBinder.cc
r9667 r10624 37 37 #include "core/config/ConfigValueIncludes.h" 38 38 #include "core/config/ConfigFile.h" 39 #include "core/PathConfig.h" 39 #include "core/ApplicationPaths.h" 40 #include "core/ConfigurablePaths.h" 40 41 #include "InputCommands.h" 41 42 #include "JoyStick.h" … … 43 44 namespace orxonox 44 45 { 46 RegisterAbstractClass(KeyBinder).inheritsFrom<JoyStickQuantityListener>(); 47 45 48 /** 46 49 @brief … … 253 256 orxout(internal_info, context::input) << "KeyBinder: Loading key bindings..." << endl; 254 257 255 this->configFile_ = new ConfigFile(this->filename_, ! PathConfig::buildDirectoryRun());258 this->configFile_ = new ConfigFile(this->filename_, !ApplicationPaths::buildDirectoryRun()); 256 259 this->configFile_->load(); 257 260 258 if ( PathConfig::buildDirectoryRun())261 if (ApplicationPaths::buildDirectoryRun()) 259 262 { 260 263 // Dev users should have combined key bindings files 261 std::string defaultFilepath( PathConfig::getDataPathString() + ConfigFile::DEFAULT_CONFIG_FOLDER + '/' + this->filename_);264 std::string defaultFilepath(ConfigurablePaths::getDataPathString() + ConfigFile::DEFAULT_CONFIG_FOLDER + '/' + this->filename_); 262 265 std::ifstream file(defaultFilepath.c_str()); 263 266 if (file.is_open()) … … 287 290 addButtonToCommand(binding, it->second); 288 291 std::string str = binding; 289 if ( PathConfig::buildDirectoryRun() && binding.empty())292 if (ApplicationPaths::buildDirectoryRun() && binding.empty()) 290 293 str = "NoBinding"; 291 294 it->second->setBinding(this->configFile_, this->fallbackConfigFile_, binding, bTemporary);
Note: See TracChangeset
for help on using the changeset viewer.