Mercurial > sdl-ios-xcode
comparison src/joystick/nds/SDL_sysjoystick.c @ 2676:082cc3ffd7d8 gsoc2008_nds
Fixed a conflict between the touch and joystick drivers. They now should both behave as expected.
author | Darren Alton <dalton@stevens.edu> |
---|---|
date | Tue, 01 Jul 2008 13:02:50 +0000 |
parents | 24a6b3588eac |
children | e1da92da346c |
comparison
equal
deleted
inserted
replaced
2675:5e4274591163 | 2676:082cc3ffd7d8 |
---|---|
89 void | 89 void |
90 SDL_SYS_JoystickUpdate(SDL_Joystick * joystick) | 90 SDL_SYS_JoystickUpdate(SDL_Joystick * joystick) |
91 { | 91 { |
92 u32 keysd, keysu; | 92 u32 keysd, keysu; |
93 int magnitude = 16384; | 93 int magnitude = 16384; |
94 scanKeys(); | 94 /*scanKeys();*/ |
95 keysd = keysDown(); | 95 keysd = keysDown(); |
96 keysu = keysUp(); | 96 keysu = keysUp(); |
97 | 97 |
98 if ((keysd & KEY_UP)) { | 98 if ((keysd & KEY_UP)) { |
99 SDL_PrivateJoystickAxis(joystick, 1, -magnitude); | 99 SDL_PrivateJoystickAxis(joystick, 1, -magnitude); |