Changeset 9981 for code/trunk/src/libraries/core

Timestamp:

Jan 4, 2014, 11:25:18 PM (11 years ago)

Author:

landauf

Message:

I think that was a bug - why should a command not be added if it has input parameters and an overwritten binding mode? (formerly on line 224)
fixed this now and reduced redundancy

File:

• code/trunk/src/libraries/core/input/Button.cc (modified) (3 diffs)

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

@@ -213 +213 @@
 
                     // we don't know whether this is an actual axis or just a button
-                    if (mode == KeybindMode::None)
-                    {
-                        if (!addParamCommand(cmd))
-                        {
-                            mode = eval.getConsoleCommand()->getKeybindMode();
-                            this->addCommand(cmd, mode, commands);
-                        }
-                    }
-                    else
-                        cmd->setFixedKeybindMode(true);
+                    if (mode != KeybindMode::None || !addParamCommand(cmd))
+                        this->addCommand(cmd, mode, commands);
                 }
                 else
@@ -228 +220 @@
                     SimpleCommand* cmd = new SimpleCommand();
                     cmd->evaluation_ = eval;
-
-                    if (mode == KeybindMode::None)
-                        mode = eval.getConsoleCommand()->getKeybindMode();
-                    else
-                        cmd->setFixedKeybindMode(true);
 
                     this->addCommand(cmd, mode, commands);
@@ -255 +242 @@
     inline void Button::addCommand(BaseCommand* cmd, KeybindMode::Value mode, std::vector<BaseCommand*> commands[3])
     {
+        if (mode == KeybindMode::None)
+            mode = cmd->getEvaluation()->getConsoleCommand()->getKeybindMode();
+        else
+            cmd->setFixedKeybindMode(true);
+
         if (mode == KeybindMode::OnPressAndRelease)
         {