The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-14 15:45:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix various joystick issues

Browse Source
This commit is contained in:
simon.kagstrom 2010-02-23 18:24:30 +00:00
parent 326deec9e0
commit 80d952aeb1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Src/Display.cpp
View File

@ -748,8 +748,8 @@ bool C64Display::NumLock(void)
void C64::open_close_joystick(int port, int oldjoy, int newjoy) void C64::open_close_joystick(int port, int oldjoy, int newjoy)
{ {
if (oldjoy != newjoy) { if (oldjoy != newjoy) {
joy_minx[port] = joy_miny[port] = 32767; // Reset calibration joy_minx[port] = joy_miny[port] = -32767; // Reset calibration
joy_maxx[port] = joy_maxy[port] = -32768; joy_maxx[port] = joy_maxy[port] = 32768;
if (newjoy) { if (newjoy) {
joy[port] = SDL_JoystickOpen(newjoy - 1); joy[port] = SDL_JoystickOpen(newjoy - 1);
if (joy[port] == NULL) if (joy[port] == NULL)
@ -766,7 +766,8 @@ void C64::open_close_joystick(int port, int oldjoy, int newjoy)
void C64::open_close_joysticks(int oldjoy1, int oldjoy2, int newjoy1, int newjoy2) void C64::open_close_joysticks(int oldjoy1, int oldjoy2, int newjoy1, int newjoy2)
{ {
open_close_joystick(0, oldjoy1, newjoy1); open_close_joystick(0, oldjoy1, newjoy1);
open_close_joystick(1, oldjoy2, newjoy2); if (SDL_NumJoysticks() > 1)
open_close_joystick(1, oldjoy2, newjoy2);
} }
/* The implementation principles are borrowed from UAE */ /* The implementation principles are borrowed from UAE */
@ -810,7 +811,7 @@ uint8 C64::poll_joystick_axes(int port)
*min_axis = axis; *min_axis = axis;
/* Too small as of yet */ /* Too small as of yet */
if (*max_axis - *min_axis < 100) if (*max_axis - *min_axis < 1000)
continue; continue;
if (axis < (*min_axis + (*max_axis - *min_axis)/3)) { if (axis < (*min_axis + (*max_axis - *min_axis)/3)) {
@ -881,10 +882,8 @@ uint8 C64::poll_joystick_buttons(int port)
else else
Gui::gui->pushEvent(KEY_ESCAPE); Gui::gui->pushEvent(KEY_ESCAPE);
if (cur != old) { TheDisplay->UpdateKeyMatrix(kc, !cur,
TheDisplay->UpdateKeyMatrix(kc, !cur, TheCIA1->KeyMatrix, TheCIA1->RevMatrix, &out);
TheCIA1->KeyMatrix, TheCIA1->RevMatrix, &out);
}
} }
return out; return out;