The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-01 08:25:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed controller mapping Reset button bug

Browse Source
This commit is contained in:
dborth 2009-07-01 17:15:47 +00:00
parent 5515cde35c
commit d59ec81978
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/ngc/input.cpp
View File

@ -62,7 +62,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
{ {
int i; int i;
/*** Gamecube controller Padmap ***/ /*** Gamecube controller Padmap ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_GCPAD)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_GCPAD))
{ {
i=0; i=0;
btnmap[CTRL_PAD][CTRLR_GCPAD][i++] = PAD_BUTTON_A; btnmap[CTRL_PAD][CTRLR_GCPAD][i++] = PAD_BUTTON_A;
@ -80,7 +80,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Wiimote Padmap ***/ /*** Wiimote Padmap ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_WIIMOTE)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_WIIMOTE))
{ {
i=0; i=0;
btnmap[CTRL_PAD][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_B; btnmap[CTRL_PAD][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_B;
@ -98,7 +98,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Classic Controller Padmap ***/ /*** Classic Controller Padmap ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_CLASSIC)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_CLASSIC))
{ {
i=0; i=0;
btnmap[CTRL_PAD][CTRLR_CLASSIC][i++] = WPAD_CLASSIC_BUTTON_A; btnmap[CTRL_PAD][CTRLR_CLASSIC][i++] = WPAD_CLASSIC_BUTTON_A;
@ -116,7 +116,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Nunchuk + wiimote Padmap ***/ /*** Nunchuk + wiimote Padmap ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_NUNCHUK)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_PAD && wiiCtrl == CTRLR_NUNCHUK))
{ {
i=0; i=0;
btnmap[CTRL_PAD][CTRLR_NUNCHUK][i++] = WPAD_BUTTON_A; btnmap[CTRL_PAD][CTRLR_NUNCHUK][i++] = WPAD_BUTTON_A;
@ -134,7 +134,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Superscope : GC controller button mapping ***/ /*** Superscope : GC controller button mapping ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_SCOPE && wiiCtrl == CTRLR_GCPAD)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_SCOPE && wiiCtrl == CTRLR_GCPAD))
{ {
i=0; i=0;
btnmap[CTRL_SCOPE][CTRLR_GCPAD][i++] = PAD_BUTTON_A; btnmap[CTRL_SCOPE][CTRLR_GCPAD][i++] = PAD_BUTTON_A;
@ -146,7 +146,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Superscope : wiimote button mapping ***/ /*** Superscope : wiimote button mapping ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_SCOPE && wiiCtrl == CTRLR_WIIMOTE)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_SCOPE && wiiCtrl == CTRLR_WIIMOTE))
{ {
i=0; i=0;
btnmap[CTRL_SCOPE][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_B; btnmap[CTRL_SCOPE][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_B;
@ -158,7 +158,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Mouse : GC controller button mapping ***/ /*** Mouse : GC controller button mapping ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_MOUSE && wiiCtrl == CTRLR_GCPAD)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_MOUSE && wiiCtrl == CTRLR_GCPAD))
{ {
i=0; i=0;
btnmap[CTRL_MOUSE][CTRLR_GCPAD][i++] = PAD_BUTTON_A; btnmap[CTRL_MOUSE][CTRLR_GCPAD][i++] = PAD_BUTTON_A;
@ -166,7 +166,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Mouse : wiimote button mapping ***/ /*** Mouse : wiimote button mapping ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_MOUSE && wiiCtrl == CTRLR_WIIMOTE)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_MOUSE && wiiCtrl == CTRLR_WIIMOTE))
{ {
i=0; i=0;
btnmap[CTRL_MOUSE][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_A; btnmap[CTRL_MOUSE][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_A;
@ -174,7 +174,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Justifier : GC controller button mapping ***/ /*** Justifier : GC controller button mapping ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_JUST && wiiCtrl == CTRLR_GCPAD)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_JUST && wiiCtrl == CTRLR_GCPAD))
{ {
i=0; i=0;
btnmap[CTRL_JUST][CTRLR_GCPAD][i++] = PAD_BUTTON_B; btnmap[CTRL_JUST][CTRLR_GCPAD][i++] = PAD_BUTTON_B;
@ -183,7 +183,7 @@ void ResetControls(int consoleCtrl, int wiiCtrl)
} }
/*** Justifier : wiimote button mapping ***/ /*** Justifier : wiimote button mapping ***/
if(consoleCtrl == 0 || (consoleCtrl == CTRL_JUST && wiiCtrl == CTRLR_WIIMOTE)) if(consoleCtrl == -1 || (consoleCtrl == CTRL_JUST && wiiCtrl == CTRLR_WIIMOTE))
{ {
i=0; i=0;
btnmap[CTRL_JUST][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_B; btnmap[CTRL_JUST][CTRLR_WIIMOTE][i++] = WPAD_BUTTON_B;

2
source/ngc/input.h
View File

@ -24,7 +24,7 @@
extern u32 btnmap[4][4][12]; extern u32 btnmap[4][4][12];
extern int rumbleRequest[4]; extern int rumbleRequest[4];
void ResetControls(int cc = 0, int wc = 0); void ResetControls(int cc = -1, int wc = -1);
void ShutoffRumble(); void ShutoffRumble();
void DoRumble(int i); void DoRumble(int i);
s8 WPAD_Stick(u8 chan, u8 right, int axis); s8 WPAD_Stick(u8 chan, u8 right, int axis);