Changeset 1641 for code/branches/gui/src/core/input/ExtendedInputState.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/ExtendedInputState.cc (modified) (1 diff)

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

@@ -118 +118 @@
     }
 
-    void ExtendedInputState::joyStickButtonPressed(unsigned int joyStickID, unsigned int button)
+    void ExtendedInputState::joyStickButtonPressed(unsigned int joyStickID, JoyStickButton::Enum id)
     {
         assert(joyStickID < joyStickHandlers_.size());
         for (unsigned int i = 0; i < joyStickHandlers_[joyStickID].size(); i++)
-            joyStickHandlers_[joyStickID][i]->joyStickButtonPressed(joyStickID, button);
-    }
-
-    void ExtendedInputState::joyStickButtonReleased(unsigned int joyStickID, unsigned int button)
+            joyStickHandlers_[joyStickID][i]->joyStickButtonPressed(joyStickID, id);
+    }
+
+    void ExtendedInputState::joyStickButtonReleased(unsigned int joyStickID, JoyStickButton::Enum id)
     {
         assert(joyStickID < joyStickHandlers_.size());
         for (unsigned int i = 0; i < joyStickHandlers_[joyStickID].size(); i++)
-            joyStickHandlers_[joyStickID][i]->joyStickButtonReleased(joyStickID, button);
-    }
-
-    void ExtendedInputState::joyStickButtonHeld(unsigned int joyStickID, unsigned int button)
+            joyStickHandlers_[joyStickID][i]->joyStickButtonReleased(joyStickID, id);
+    }
+
+    void ExtendedInputState::joyStickButtonHeld(unsigned int joyStickID, JoyStickButton::Enum id)
     {
         assert(joyStickID < joyStickHandlers_.size());
         for (unsigned int i = 0; i < joyStickHandlers_[joyStickID].size(); i++)
-            joyStickHandlers_[joyStickID][i]->joyStickButtonHeld(joyStickID, button);
+            joyStickHandlers_[joyStickID][i]->joyStickButtonHeld(joyStickID, id);
     }