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

Fix wii key bindings and multiple joystick input (nunchuk/classic)

Browse Source
This commit is contained in:
simon.kagstrom 2010-03-21 12:23:58 +00:00
parent 60eda70d30
commit 8816763fce
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Src/Display.cpp
View File

@ -905,6 +905,9 @@ uint8 C64::poll_joystick_buttons(int port, uint8 *table, bool *has_event)
if (table[kc] == 0) if (table[kc] == 0)
table[kc] = cur ? 2 : 1; table[kc] = cur ? 2 : 1;
/* Special case for joysticks: Each button can be pressed multiple times */
if ((kc & 0x40) && cur)
table[kc] = 2;
} }
return out; return out;

12
Src/gui/bind_keys_menu.cpp
View File

@ -60,8 +60,8 @@ public:
case 1: ck = &Gui::gui->np->JoystickButtons[1]; break; case 1: ck = &Gui::gui->np->JoystickButtons[1]; break;
case 2: ck = &Gui::gui->np->JoystickButtons[2]; break; case 2: ck = &Gui::gui->np->JoystickButtons[2]; break;
case 3: ck = &Gui::gui->np->JoystickButtons[3]; break; case 3: ck = &Gui::gui->np->JoystickButtons[3]; break;
case 4: ck = &Gui::gui->np->JoystickButtons[4]; break; case 4: ck = &Gui::gui->np->JoystickButtons[5]; break;
case 5: ck = &Gui::gui->np->JoystickButtons[5]; break; case 5: ck = &Gui::gui->np->JoystickButtons[4]; break;
default: default:
panic("Wiimote: impossible selection %d", this->p_submenus[0].sel); break; panic("Wiimote: impossible selection %d", this->p_submenus[0].sel); break;
} }
@ -86,8 +86,8 @@ public:
case 5: ck = &Gui::gui->np->JoystickButtons[14]; break; case 5: ck = &Gui::gui->np->JoystickButtons[14]; break;
case 6: ck = &Gui::gui->np->JoystickButtons[15]; break; case 6: ck = &Gui::gui->np->JoystickButtons[15]; break;
case 7: ck = &Gui::gui->np->JoystickButtons[16]; break; case 7: ck = &Gui::gui->np->JoystickButtons[16]; break;
case 8: ck = &Gui::gui->np->JoystickButtons[17]; break; case 8: ck = &Gui::gui->np->JoystickButtons[18]; break;
case 9: ck = &Gui::gui->np->JoystickButtons[18]; break; case 9: ck = &Gui::gui->np->JoystickButtons[17]; break;
default: default:
panic("Classic: impossible selection %d", this->p_submenus[2].sel); break; panic("Classic: impossible selection %d", this->p_submenus[2].sel); break;
} }
@ -158,6 +158,8 @@ public:
this->hm[4] = this->addOne(this->hm[4], this->allocOne("b: %s", stringToPtr_Classic("b"))); this->hm[4] = this->addOne(this->hm[4], this->allocOne("b: %s", stringToPtr_Classic("b")));
this->hm[4] = this->addOne(this->hm[4], this->allocOne("x: %s", stringToPtr_Classic("x"))); this->hm[4] = this->addOne(this->hm[4], this->allocOne("x: %s", stringToPtr_Classic("x")));
this->hm[4] = this->addOne(this->hm[4], this->allocOne("y: %s", stringToPtr_Classic("y"))); this->hm[4] = this->addOne(this->hm[4], this->allocOne("y: %s", stringToPtr_Classic("y")));
this->hm[4] = this->addOne(this->hm[4], this->allocOne("L: %s", stringToPtr_Classic("L")));
this->hm[4] = this->addOne(this->hm[4], this->allocOne("R: %s", stringToPtr_Classic("R")));
this->hm[4] = this->addOne(this->hm[4], this->allocOne("Zl: %s", stringToPtr_Classic("Zl"))); this->hm[4] = this->addOne(this->hm[4], this->allocOne("Zl: %s", stringToPtr_Classic("Zl")));
this->hm[4] = this->addOne(this->hm[4], this->allocOne("Zr: %s", stringToPtr_Classic("Zr"))); this->hm[4] = this->addOne(this->hm[4], this->allocOne("Zr: %s", stringToPtr_Classic("Zr")));
this->hm[4] = this->addOne(this->hm[4], this->allocOne("+: %s", stringToPtr_Classic("+"))); this->hm[4] = this->addOne(this->hm[4], this->allocOne("+: %s", stringToPtr_Classic("+")));
@ -352,7 +354,7 @@ private:
HelpBox *help; HelpBox *help;
int *cur_key; int *cur_key;
const char **hm[12]; const char **hm[14];
}; };
void AnalogueBindListener::selectCallback(DialogueBox *which, int selected) void AnalogueBindListener::selectCallback(DialogueBox *which, int selected)

2
Src/gui/menu_messages.c
View File

@ -212,7 +212,7 @@ const char *bind_key_menu_messages[13] = {
/*02*/ "Nunchuk", /*02*/ "Nunchuk",
/*03*/ "^|Z|C", /*03*/ "^|Z|C",
/*04*/ "Classic", /*04*/ "Classic",
/*05*/ "^|a|b|x|y|Zl|Zr|+|-", /*05*/ "^|a|b|x|y|L|R|Zl|Zr|+|-",
/*06*/ " ", /*06*/ " ",
/*07*/ "Reset to defaults", /*07*/ "Reset to defaults",
NULL NULL