Changeset 7219 for code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc

Timestamp:

Aug 26, 2010, 12:09:12 AM (14 years ago)

Author:

landauf

Message:

adapted all console commands to the new interface

File:

• code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc (modified) (3 diffs)

code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc

@@ -43 +43 @@
     ManageScopedSingleton(KeyBinderManager, ScopeID::Graphics, false);
 
+    static const std::string __CC_keybind_name = "keybind";
+    static const std::string __CC_tkeybind_name = "tkeybind";
+    static const std::string __CC_unbind_name = "unbind";
+    static const std::string __CC_tunbind_name = "tunbind";
+
+    _SetConsoleCommand(__CC_keybind_name,  &KeyBinderManager::keybind).defaultValues("");
+    _SetConsoleCommand(__CC_tkeybind_name, &KeyBinderManager::tkeybind).defaultValues("");
+    _SetConsoleCommand(__CC_unbind_name,   &KeyBinderManager::unbind).defaultValues("");
+    _SetConsoleCommand(__CC_tunbind_name,  &KeyBinderManager::tunbind).defaultValues("");
+
     KeyBinderManager::KeyBinderManager()
         : currentBinder_(NULL)
@@ -52 +62 @@
 
         // keybind console commands
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::keybind,  this), "keybind" ))
-            .defaultValues("");
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::tkeybind, this), "tkeybind"))
-            .defaultValues("");
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::unbind, this), "unbind"))
-            .defaultValues("");
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::tunbind, this), "tunbind"))
-            .defaultValues("");
+        _ModifyConsoleCommand(__CC_keybind_name ).setObject(this);
+        _ModifyConsoleCommand(__CC_tkeybind_name).setObject(this);
+        _ModifyConsoleCommand(__CC_unbind_name  ).setObject(this);
+        _ModifyConsoleCommand(__CC_tunbind_name ).setObject(this);
 
         // Load default key binder
@@ -70 +76 @@
         for (std::map<std::string, KeyBinder*>::const_iterator it = this->binders_.begin(); it != this->binders_.end(); ++it)
             delete it->second;
+
+        // Reset console commands
+        _ModifyConsoleCommand(__CC_keybind_name ).setObject(0);
+        _ModifyConsoleCommand(__CC_tkeybind_name).setObject(0);
+        _ModifyConsoleCommand(__CC_unbind_name  ).setObject(0);
+        _ModifyConsoleCommand(__CC_tunbind_name ).setObject(0);
     }