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

Fix mapping of multiple joystick buttons to the same C64 key/button.

Browse Source 
Removed some dead code as well.
This commit is contained in:
simon.kagstrom 2010-03-13 08:14:04 +00:00
parent dc74ffeb19
commit 23be1855b5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Src/C64.h
View File

@ -173,7 +173,6 @@ private:
int joy_minx[2], joy_maxx[2], joy_miny[2], joy_maxy[2]; // For dynamic joystick calibration
uint8 joykey; // Joystick keyboard emulation mask value
bool joy_button_pressed[MAX_JOYSTICK_BUTTONS];
uint8 orig_kernal_1d84, // Original contents of kernal locations $1d84 and $1d85
orig_kernal_1d85; // (for undoing the Fast Reset patch)

4
Src/Display.cpp
View File

@ -895,7 +895,6 @@ uint8 C64::poll_joystick_buttons(int port, uint8 *table, bool *has_event)
int kc = ThePrefs.JoystickButtons[i];
event_t ev = (event_t)ThePrefs.MenuJoystickButtons[i];
this->joy_button_pressed[i] = cur;
if (cur && ev != EVENT_NONE)
{
Gui::gui->pushJoystickEvent(ev);
@ -904,7 +903,8 @@ uint8 C64::poll_joystick_buttons(int port, uint8 *table, bool *has_event)
if (kc == JOY_NONE)
continue;
table[kc] = cur ? 2 : 1;
if (table[kc] == 0)
table[kc] = cur ? 2 : 1;
}
return out;