Changeset 6428 for code/trunk/src/libraries/core/input/KeyBinder.cc

Timestamp:

Dec 28, 2009, 11:10:37 PM (14 years ago)

Author:

rgrieder

Message:

Changed config value handling in the KeyBinder. Doesn't change the interface though.

File:

• code/trunk/src/libraries/core/input/KeyBinder.cc (modified) (4 diffs)

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -57 +57 @@
         RegisterRootObject(KeyBinder);
 
-        // intialise all buttons and half axes to avoid creating everything with 'new'
+        // initialise all buttons and half axes to avoid creating everything with 'new'
         // keys
         for (unsigned int i = 0; i < KeyCode::numberOfKeys; i++)
@@ -168 +168 @@
             {
                 for (unsigned int i = 0; i < JoyStickButtonCode::numberOfButtons; ++i)
-                    (*joyStickButtons_[iDev])[i].readConfigValue(this->configFile_);
+                    (*joyStickButtons_[iDev])[i].readBinding(this->configFile_);
                 for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; ++i)
-                    (*joyStickAxes_[iDev])[i].readConfigValue(this->configFile_);
+                    (*joyStickAxes_[iDev])[i].readBinding(this->configFile_);
             }
         }
@@ -257 +257 @@
         for (std::map<std::string, Button*>::const_iterator it = allButtons_.begin(); it != allButtons_.end(); ++it)
         {
-            it->second->readConfigValue(this->configFile_);
+            it->second->readBinding(this->configFile_);
             addButtonToCommand(it->second->bindingString_, it->second);
         }
@@ -270 +270 @@
         {
             addButtonToCommand(binding, it->second);
-            if (bTemporary)
-                it->second->configContainer_->tset(binding);
-            else
-                it->second->configContainer_->set(binding);
-            it->second->configContainer_->getValue(&(it->second->bindingString_), it->second);
+            it->second->setBinding(this->configFile_, binding, bTemporary);
             return true;
         }