mirror of
https://github.com/Oibaf66/frodo-wii.git
synced 2024-11-25 21:14:22 +01:00
Fix mapping of multiple joystick buttons to the same C64 key/button.
Removed some dead code as well.
This commit is contained in:
parent
dc74ffeb19
commit
23be1855b5
@ -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)
|
||||
|
@ -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,6 +903,7 @@ uint8 C64::poll_joystick_buttons(int port, uint8 *table, bool *has_event)
|
||||
if (kc == JOY_NONE)
|
||||
continue;
|
||||
|
||||
if (table[kc] == 0)
|
||||
table[kc] = cur ? 2 : 1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user