From 3d812c139b6996d04723d002cae8c8fddf4bb81a Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Mon, 28 Sep 2009 07:05:10 +0000
Subject: [PATCH] patch from issue 194

---
 source/ngc/pad.cpp | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/source/ngc/pad.cpp b/source/ngc/pad.cpp
index c11cf51..6bc51fd 100644
--- a/source/ngc/pad.cpp
+++ b/source/ngc/pad.cpp
@@ -403,9 +403,8 @@ static void UpdateCursorPosition (int pad)
 /****************************************************************************
  * 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
-static int rapidbutton[4][2] = {{0}};
+
+extern int rapidAlternator;
 
 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(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
-					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
-					rapidbutton[pad][1] = RAPID_PRESS;
+					J |= JOY_B;
 				}
 				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
 	if(GCSettings.Controller == CTRL_ZAPPER)
 	{