[Orxonox-commit 1191] r5912 - code/branches/core5/src/libraries/core/input

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-10-08 23:11:49 +0200 (Thu, 08 Oct 2009)
New Revision: 5912

Modified:
   code/branches/core5/src/libraries/core/input/Button.cc
   code/branches/core5/src/libraries/core/input/KeyBinderManager.cc
Log:
New feature: "keybind" without arguments de-binds a key. We couldn't do that before ^^

Modified: code/branches/core5/src/libraries/core/input/Button.cc
===================================================================
--- code/branches/core5/src/libraries/core/input/Button.cc	2009-10-08 20:56:29 UTC (rev 5911)
+++ code/branches/core5/src/libraries/core/input/Button.cc	2009-10-08 21:11:49 UTC (rev 5912)
@@ -169,7 +169,7 @@
                 }
 
                 // evaluate the command
-                CommandEvaluation eval = CommandExecutor::evaluate(commandStr);
+                const CommandEvaluation& eval = CommandExecutor::evaluate(commandStr);
                 if (!eval.isValid())
                 {
                     parseError("Command evaluation of \"" + commandStr + "\"failed.", true);

Modified: code/branches/core5/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/core5/src/libraries/core/input/KeyBinderManager.cc	2009-10-08 20:56:29 UTC (rev 5911)
+++ code/branches/core5/src/libraries/core/input/KeyBinderManager.cc	2009-10-08 21:11:49 UTC (rev 5912)
@@ -53,8 +53,10 @@
         this->setConfigValues();
 
         // keybind console commands
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::keybind,  this), "keybind" ));
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::tkeybind, this), "tkeybind"));
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::keybind,  this), "keybind" ))
+            .defaultValues("");
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::tkeybind, this), "tkeybind"))
+            .defaultValues("");
 
         // Load default key binder
         this->setCurrent(defaultFilename_);