The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2025-01-07 14:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

patch from issue 194

Browse Source
This commit is contained in:
dborth 2009-09-28 07:05:10 +00:00
parent bf0a0a2f33
commit 3d812c139b
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/ngc/pad.cpp
View File

@ -403,9 +403,8 @@ static void UpdateCursorPosition (int pad)
/**************************************************************************** /****************************************************************************
* Convert GC Joystick Readings to JOY * Convert GC Joystick Readings to JOY
****************************************************************************/ ****************************************************************************/
static int RAPID_SKIP = 2; // frames to skip between rapid button presses
static int RAPID_PRESS = 2; // number of rapid button presses to execute extern int rapidAlternator;
static int rapidbutton[4][2] = {{0}};
static unsigned char DecodeJoy( unsigned short pad ) static unsigned char DecodeJoy( unsigned short pad )
{ {
@ -516,15 +515,15 @@ static unsigned char DecodeJoy( unsigned short pad )
// if zapper is on, ignore all buttons except START and SELECT // if zapper is on, ignore all buttons except START and SELECT
if(GCSettings.Controller != CTRL_ZAPPER || nespadmap[i] == JOY_START || nespadmap[i] == JOY_SELECT) if(GCSettings.Controller != CTRL_ZAPPER || nespadmap[i] == JOY_START || nespadmap[i] == JOY_SELECT)
{ {
if(nespadmap[i] == RAPID_A) if(rapidAlternator && nespadmap[i] == RAPID_A)
{ {
// activate rapid fire for A button // activate rapid fire for A button
rapidbutton[pad][0] = RAPID_PRESS; J |= JOY_A;
} }
else if(nespadmap[i] == RAPID_B) else if(rapidAlternator && nespadmap[i] == RAPID_B)
{ {
// activate rapid fire for B button // activate rapid fire for B button
rapidbutton[pad][1] = RAPID_PRESS; J |= JOY_B;
} }
else if(nespadmap[i] > 0) else if(nespadmap[i] > 0)
{ {
@ -548,21 +547,6 @@ static unsigned char DecodeJoy( unsigned short pad )
} }
} }
// rapid fire buttons
if(FrameTimer % RAPID_SKIP == 0) // only press button every X frames
{
if(rapidbutton[pad][0] > 0) // rapid A
{
J |= JOY_A;
rapidbutton[pad][0]--;
}
if(rapidbutton[pad][1] > 0) // rapid B
{
J |= JOY_B;
rapidbutton[pad][1]--;
}
}
// zapper enabled // zapper enabled
if(GCSettings.Controller == CTRL_ZAPPER) if(GCSettings.Controller == CTRL_ZAPPER)
{ {