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

Timestamp:

Jan 1, 2010, 10:05:56 PM (14 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.h (modified) (1 diff)

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

@@ -52 +52 @@
         virtual bool addParamCommand(ParamCommand* command) { return false; }
         void parse(const std::string& binding);
-        void readBinding(ConfigFile* configFile);
-        void setBinding(ConfigFile* configFile, const std::string& binding, bool bTemporary);
+        void readBinding(ConfigFile* configFile, ConfigFile* fallbackFile);
+        void setBinding(ConfigFile* configFile, ConfigFile* fallbackFile, const std::string& binding, bool bTemporary);
         bool execute(KeybindMode::Value mode, float abs = 1.0f, float rel = 1.0f);