From bd9a60fef230d173142924eec12d8c08537b4e62 Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Wed, 6 Jan 2010 08:32:26 +0000 Subject: [PATCH] Reverted last modifications in sf::Input (they were supposed to happen in trunk) git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1326 4e206d99-4929-0410-ac5d-dfc041789085 --- include/SFML/Window/Input.hpp | 4 ++-- src/SFML/Window/Input.cpp | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/SFML/Window/Input.hpp b/include/SFML/Window/Input.hpp index 7d9e1719..1e8f5c6c 100644 --- a/include/SFML/Window/Input.hpp +++ b/include/SFML/Window/Input.hpp @@ -133,10 +133,10 @@ private : //////////////////////////////////////////////////////////// bool myKeys[Key::Count]; ///< Array containing the state of all keyboard keys bool myMouseButtons[Mouse::Count]; ///< Array containing the state of all mouse buttons - bool myJoystickButtons[4][32]; ///< Array containing the state of all joysticks buttons + bool myJoystickButtons[2][32]; ///< Array containing the state of all joysticks buttons int myMouseX; ///< Mouse position on X int myMouseY; ///< Mouse position on Y - float myJoystickAxis[4][Joy::Count]; ///< Joysticks position on each axis + float myJoystickAxis[2][Joy::Count]; ///< Joysticks position on each axis }; } // namespace sf diff --git a/src/SFML/Window/Input.cpp b/src/SFML/Window/Input.cpp index d6ef8f43..6e1e02b9 100644 --- a/src/SFML/Window/Input.cpp +++ b/src/SFML/Window/Input.cpp @@ -45,16 +45,12 @@ myMouseY(0) { myJoystickButtons[0][i] = false; myJoystickButtons[1][i] = false; - myJoystickButtons[2][i] = false; - myJoystickButtons[3][i] = false; } for (int i = 0; i < Joy::Count; ++i) { myJoystickAxis[0][i] = 0.f; myJoystickAxis[1][i] = 0.f; - myJoystickAxis[2][i] = 0.f; - myJoystickAxis[3][i] = 0.f; } } @@ -145,8 +141,6 @@ void Input::OnEvent(const Event& event) { myJoystickButtons[0][i] = false; myJoystickButtons[1][i] = false; - myJoystickButtons[2][i] = false; - myJoystickButtons[3][i] = false; } break; }