Changeset 6437 for code/branches/gamestate/src/libraries/core/input/Button.cc

Timestamp:

Jan 1, 2010, 10:05:56 PM (15 years ago)

Author:

rgrieder

Message:

Added support for keybindings.ini merging:
When running development builds, the keybinder will merge the local file and the one from the data folder.
Catch: if you want to remove a binding, you'll have to write "NoBinding" (not case sensitive) to override the default command

The keybind command already does that for you though.

File:

• code/branches/gamestate/src/libraries/core/input/Button.cc (modified) (2 diffs)

code/branches/gamestate/src/libraries/core/input/Button.cc

@@ -82 +82 @@
     }
 
-    void Button::readBinding(ConfigFile* configFile)
-    {
-        const std::string& binding = configFile->getOrCreateValue(groupName_, name_, "", true);
+    void Button::readBinding(ConfigFile* configFile, ConfigFile* fallbackFile)
+    {
+        std::string binding = configFile->getOrCreateValue(groupName_, name_, "", true);
+        if (binding.empty() && fallbackFile)
+            binding = fallbackFile->getValue(groupName_, name_, true);
         this->parse(binding);
     }
 
-    void Button::setBinding(ConfigFile* configFile, const std::string& binding, bool bTemporary)
+    void Button::setBinding(ConfigFile* configFile, ConfigFile* fallbackFile, const std::string& binding, bool bTemporary)
     {
         if (!bTemporary)
@@ -104 +106 @@
         this->bindingString_ = binding;
 
-        if (isEmpty(bindingString_))
+        if (isEmpty(bindingString_) || removeTrailingWhitespaces(getLowercase(binding)) == "nobinding")
             return;