Changeset 1641 for code/branches/gui/src/core/input/KeyBinder.cc

Timestamp:

Jul 22, 2008, 9:16:35 PM (16 years ago)

Author:

rgrieder

Message:

some de-bugging
added enum for joy stick buttons
some more little fixes

File:

• code/branches/gui/src/core/input/KeyBinder.cc (modified) (2 diffs)

code/branches/gui/src/core/input/KeyBinder.cc

@@ -374 +374 @@
     }
 
-    void KeyBinder::tickJoyStick(float dt, int device)
+    void KeyBinder::tickJoyStick(float dt, unsigned int joyStick)
     {
         tickDevices(8, nHalfAxes_s);
@@ -448 +448 @@
 
 
-    void KeyBinder::joyStickButtonPressed (unsigned int joyStickID, unsigned int button)
-    { joyStickButtons_[button].execute(KeybindMode::OnPress); }
-
-    void KeyBinder::joyStickButtonReleased(unsigned int joyStickID, unsigned int button)
-    { joyStickButtons_[button].execute(KeybindMode::OnRelease); }
-
-    void KeyBinder::joyStickButtonHeld    (unsigned int joyStickID, unsigned int button)
-    { joyStickButtons_[button].execute(KeybindMode::OnHold); }
+    void KeyBinder::joyStickButtonPressed (unsigned int joyStickID, JoyStickButton::Enum id)
+    { joyStickButtons_[id].execute(KeybindMode::OnPress); }
+
+    void KeyBinder::joyStickButtonReleased(unsigned int joyStickID, JoyStickButton::Enum id)
+    { joyStickButtons_[id].execute(KeybindMode::OnRelease); }
+
+    void KeyBinder::joyStickButtonHeld    (unsigned int joyStickID, JoyStickButton::Enum id)
+    { joyStickButtons_[id].execute(KeybindMode::OnHold); }
 
     /**