Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted last modifications in sf::Input (they were supposed to happen in trunk)

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1326 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-01-06 08:32:26 +00:00
parent 9bda3a4ef2
commit bd9a60fef2
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/SFML/Window/Input.hpp
View File

@ -133,10 +133,10 @@ private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool myKeys[Key::Count]; ///< Array containing the state of all keyboard keys 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 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 myMouseX; ///< Mouse position on X
int myMouseY; ///< Mouse position on Y 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 } // namespace sf

6
src/SFML/Window/Input.cpp
View File

@ -45,16 +45,12 @@ myMouseY(0)
{ {
myJoystickButtons[0][i] = false; myJoystickButtons[0][i] = false;
myJoystickButtons[1][i] = false; myJoystickButtons[1][i] = false;
myJoystickButtons[2][i] = false;
myJoystickButtons[3][i] = false;
} }
for (int i = 0; i < Joy::Count; ++i) for (int i = 0; i < Joy::Count; ++i)
{ {
myJoystickAxis[0][i] = 0.f; myJoystickAxis[0][i] = 0.f;
myJoystickAxis[1][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[0][i] = false;
myJoystickButtons[1][i] = false; myJoystickButtons[1][i] = false;
myJoystickButtons[2][i] = false;
myJoystickButtons[3][i] = false;
} }
break; break;
} }