The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2025-02-16 20:39:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct some key binding issues

Browse Source
This commit is contained in:
simon.kagstrom 2009-03-09 18:54:43 +00:00
parent cc9e8dc583
commit 835d481221
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/C64_SDL.h
View File

@ -283,7 +283,7 @@ void C64::bind_keys(Prefs *np)
memset(bind_key_messages, 0, sizeof(const char*) * (N_WIIMOTE_BINDINGS + 1));
for (int i = 0; i < (has_classic_controller ? N_WIIMOTE_BINDINGS : CLASSIC_UP - 1); i++)
for (int i = 0; i < (has_classic_controller ? N_WIIMOTE_BINDINGS : CLASSIC_UP); i++)
bind_key_messages[i] = this->bind_one_key(np, i);
int opt = menu_select(bind_key_messages, NULL);

8
Src/Display_SDL.h
View File

@ -699,9 +699,9 @@ uint8 C64::poll_joystick(int port)
extra_keys[CLASSIC_ZR] = held_classic & CLASSIC_CTRL_BUTTON_ZR;
extra_keys[WIIMOTE_PLUS] = (held_classic & CLASSIC_CTRL_BUTTON_PLUS) |
held & WPAD_BUTTON_PLUS;
(held & WPAD_BUTTON_PLUS);
extra_keys[WIIMOTE_MINUS] = (held_classic & CLASSIC_CTRL_BUTTON_MINUS) |
held & WPAD_BUTTON_MINUS;
(held & WPAD_BUTTON_MINUS);
/* nunchuck and classic analogue.. just map to the d-pad! */
if (wpad->exp.type == EXP_NUNCHUK)
@ -723,11 +723,11 @@ uint8 C64::poll_joystick(int port)
/* Merge common keys */
int active_binded_keys[N_WIIMOTE_BINDINGS];
memcpy(active_binded_keys, ThePrefs.JoystickKeyBinding, sizeof(active_binded_keys));
for (int first = 0; first <= N_WIIMOTE_BINDINGS; first++)
for (int first = 0; first < N_WIIMOTE_BINDINGS; first++)
{
if (!extra_keys[first])
continue;
for (int second = 0; second <= N_WIIMOTE_BINDINGS; second++)
for (int second = 0; second < N_WIIMOTE_BINDINGS; second++)
{
if (first != second &&
active_binded_keys[first] ==