vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add cbutton/arrow support to options menu

This commit is contained in:
enigma9o7 2020-10-04 08:40:11 -07:00 committed by GitHub
parent c1ed30a2fa
commit 9c293f486b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/options_menu.c
View File

@ -572,13 +572,13 @@ void optmenu_check_buttons(void) {
allowInput = 1; allowInput = 1;
} }
if (ABS(gPlayer1Controller->stickY) > 60) { if ((ABS(gPlayer1Controller->stickY) > 60) || (gPlayer1Controller->buttonPressed & (D_CBUTTONS|U_CBUTTONS))) {
if (allowInput) { if (allowInput) {
#ifndef nosound #ifndef nosound
play_sound(SOUND_MENU_CHANGE_SELECT, gDefaultSoundArgs); play_sound(SOUND_MENU_CHANGE_SELECT, gDefaultSoundArgs);
#endif #endif
if (gPlayer1Controller->stickY >= 60) { if ((gPlayer1Controller->stickY >= 60) || (gPlayer1Controller->buttonPressed & U_CBUTTONS)) {
currentMenu->select--; currentMenu->select--;
if (currentMenu->select < 0) if (currentMenu->select < 0)
currentMenu->select = currentMenu->numOpts-1; currentMenu->select = currentMenu->numOpts-1;
@ -593,12 +593,12 @@ void optmenu_check_buttons(void) {
else if (currentMenu->select > currentMenu->scroll + 3) else if (currentMenu->select > currentMenu->scroll + 3)
currentMenu->scroll = currentMenu->select - 3; currentMenu->scroll = currentMenu->select - 3;
} }
} else if (ABS(gPlayer1Controller->stickX) > 60) { } else if ((ABS(gPlayer1Controller->stickX) > 60) || (gPlayer1Controller->buttonPressed & (L_CBUTTONS|R_CBUTTONS))) {
if (allowInput) { if (allowInput) {
#ifndef nosound #ifndef nosound
play_sound(SOUND_MENU_CHANGE_SELECT, gDefaultSoundArgs); play_sound(SOUND_MENU_CHANGE_SELECT, gDefaultSoundArgs);
#endif #endif
if (gPlayer1Controller->stickX >= 60) if ((gPlayer1Controller->stickX >= 60) || (gPlayer1Controller->buttonPressed & R_CBUTTONS))
optmenu_opt_change(&currentMenu->opts[currentMenu->select], 1); optmenu_opt_change(&currentMenu->opts[currentMenu->select], 1);
else else
optmenu_opt_change(&currentMenu->opts[currentMenu->select], -1); optmenu_opt_change(&currentMenu->opts[currentMenu->select], -1);