Changeset 1288 for code/branches/merge/src

Timestamp:

May 15, 2008, 4:16:45 PM (17 years ago)

Author:

rgrieder

Message:

• hackfix for the SpaceShip

File:

• code/branches/merge/src/core/InputManager.cc (modified) (2 diffs)

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

@@ -382 +382 @@
           activeKeyHandlers_.push_back(keyHandlers_["keybinder"]);
           activeMouseHandlers_.push_back(mouseHandlers_["keybinder"]);
-          activeMouseHandlers_.push_back(mouseHandlers_["SpaceShip"]);
+          if (getMouseHandler("SpaceShip"))
+            activeMouseHandlers_.push_back(mouseHandlers_["SpaceShip"]);
           for (unsigned int i = 0; i < joySticksSize_; i++)
             activeJoyStickHandlers_[i].push_back(joyStickHandlers_["keybinder"]);
@@ -393 +394 @@
         case IS_CONSOLE:
           activeMouseHandlers_.push_back(mouseHandlers_["keybinder"]);
-          activeMouseHandlers_.push_back(mouseHandlers_["SpaceShip"]);
+          if (getMouseHandler("SpaceShip"))
+            activeMouseHandlers_.push_back(mouseHandlers_["SpaceShip"]);
           for (unsigned int i = 0; i < joySticksSize_; i++)
             activeJoyStickHandlers_[i].push_back(joyStickHandlers_["keybinder"]);