Changeset 1428 for code/branches/network/src/core/InputManager.cc

Timestamp:

May 26, 2008, 11:36:50 AM (17 years ago)

Author:

rgrieder

Message:

• added SetConfigValueGeneric to set the config value of the actual class when using hierarchies
• fixed a bug when handling derived mouse input
• refined 'keybind' command so that input goes to KeyDetector only

File:

• code/branches/network/src/core/InputManager.cc (modified) (4 diffs)

code/branches/network/src/core/InputManager.cc

@@ -371 +371 @@
   }
 
+  void InputManager::_saveState()
+  {
+    savedHandlers_.activeHandlers_ = activeHandlers_;
+    savedHandlers_.activeJoyStickHandlers_ = activeJoyStickHandlers_;
+    savedHandlers_.activeKeyHandlers_ = activeKeyHandlers_;
+    savedHandlers_.activeMouseHandlers_ = activeMouseHandlers_;
+  }
+
+  void InputManager::_restoreState()
+  {
+    activeHandlers_ = savedHandlers_.activeHandlers_;
+    activeJoyStickHandlers_ = savedHandlers_.activeJoyStickHandlers_;
+    activeKeyHandlers_ = savedHandlers_.activeKeyHandlers_;
+    activeMouseHandlers_ = savedHandlers_.activeMouseHandlers_;
+  }
+
   void InputManager::_updateTickables()
   {
@@ -405 +421 @@
       return;
 
-    // reset the game if it has changed
     if (state_ != stateRequest_)
     {
       if (stateRequest_ != IS_CUSTOM)
       {
-        if (stateRequest_ != IS_NODETECT && stateRequest_ != IS_DETECT)
+        if (stateRequest_ != IS_DETECT)
         {
           activeKeyHandlers_.clear();
@@ -439 +454 @@
         case IS_DETECT:
           savedState_ = state_;
+          _saveState();
+
+          activeKeyHandlers_.clear();
+          activeMouseHandlers_.clear();
+          for (unsigned int i = 0; i < joySticksSize_; i++)
+            activeJoyStickHandlers_[i].clear();
+
           enableKeyHandler("keydetector");
           enableMouseHandler("keydetector");
@@ -445 +467 @@
 
         case IS_NODETECT:
-          disableKeyHandler("keydetector");
-          disableMouseHandler("keydetector");
-          disableJoyStickHandler("keydetector", 0);
+          _restoreState();
           break;