Changeset 7891

Timestamp:

Feb 14, 2011, 10:30:01 PM (13 years ago)

Author:

landauf

Message:

keybind mode shouldn't be changed if it was defined explicitly in the keybindings.ini

Location:

code/trunk/src/libraries/core/input

Files:

• Button.cc (modified) (2 diffs)
• InputCommands.h (modified) (1 diff)
• KeyBinder.cc (modified) (1 diff)

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

@@ -219 +219 @@
                         }
                     }
+                    else
+                        cmd->setFixedKeybindMode(true);
                 }
                 else
@@ -227 +229 @@
                     if (mode == KeybindMode::None)
                         mode = eval.getConsoleCommand()->getKeybindMode();
+                    else
+                        cmd->setFixedKeybindMode(true);
 
                     commands[mode].push_back(cmd);

code/trunk/src/libraries/core/input/InputCommands.h

@@ -56 +56 @@
     {
     public:
+        BaseCommand() : bFixedKeybindMode_(false) {}
         virtual ~BaseCommand() { }
+
         virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;
         virtual CommandEvaluation* getEvaluation() = 0;
+
+        inline void setFixedKeybindMode(bool fixed)
+            { this->bFixedKeybindMode_ = fixed; }
+        inline bool hasFixedKeybindMode() const
+            { return this->bFixedKeybindMode_; }
+
+    private:
+        bool bFixedKeybindMode_;
     };
 

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

@@ -404 +404 @@
                 for (size_t command_index = 0; command_index < button->nCommands_[mode_index]; ++command_index)
                 {
+                    if (button->commands_[mode_index][command_index]->hasFixedKeybindMode())
+                        continue;
+
                     CommandEvaluation* evaluation = button->commands_[mode_index][command_index]->getEvaluation();