X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fjoystick.cpp;h=2de43cecfabd054952d95b013381141a014acf98;hb=f0e50fb1d23805881b72d51ea603be78b645ec97;hp=9fe2197a276dbf14e5caebc7ac03e44239bed4d8;hpb=ff3fa0b1ecf246a104ff10fa6c3dc225cccce82f;p=virtualjaguar

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 9fe2197..2de43ce 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -4,6 +4,13 @@
 // by cal2
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
 // Cleanups/fixes by James L. Hammons
+// (C) 2010 Underground Software
+//
+// JLH = James L. Hammons <jlhamm@acm.org>
+//
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  01/16/2010  Created this log ;-)
 //
 
 #include "joystick.h"
@@ -11,7 +18,7 @@
 #include <SDL.h>
 #include <time.h>
 #include "gpu.h"
-#include "gui.h"
+//#include "gui.h"
 #include "jaguar.h"
 #include "log.h"
 #include "settings.h"
@@ -45,6 +52,9 @@
 static uint8 joystick_ram[4];
 static uint8 joypad_0_buttons[21];
 static uint8 joypad_1_buttons[21];
+
+bool keyBuffer[21];
+
 //extern bool finished;
 ////extern bool showGUI;
 bool GUIKeyHeld = false;
@@ -88,6 +98,7 @@ void JoystickExec(void)
 	// Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
 //	vjs.p1KeyBindings[0] = sdlemu_getval_int("p1k_up", SDLK_UP);
 
+#if 0
 	if (keystate[vjs.p1KeyBindings[0]])
 		joypad_0_buttons[BUTTON_U] = 0x01;
 	if (keystate[vjs.p1KeyBindings[1]])
@@ -103,6 +114,23 @@ void JoystickExec(void)
 		joypad_0_buttons[BUTTON_B] = 0x01;
 	if (keystate[vjs.p1KeyBindings[6]])
 		joypad_0_buttons[BUTTON_A] = 0x01;
+#else
+	if (keyBuffer[0])
+		joypad_0_buttons[BUTTON_U] = 0x01;
+	if (keyBuffer[1])
+		joypad_0_buttons[BUTTON_D] = 0x01;
+	if (keyBuffer[2])
+		joypad_0_buttons[BUTTON_L] = 0x01;
+	if (keyBuffer[3])
+		joypad_0_buttons[BUTTON_R] = 0x01;
+	// The buttons are labelled C,B,A on the controller (going from left to right)
+	if (keyBuffer[4])
+		joypad_0_buttons[BUTTON_C] = 0x01;
+	if (keyBuffer[5])
+		joypad_0_buttons[BUTTON_B] = 0x01;
+	if (keyBuffer[6])
+		joypad_0_buttons[BUTTON_A] = 0x01;
+#endif
 //I may yet move these to O and P...
 	if (keystate[vjs.p1KeyBindings[7]])
 		joypad_0_buttons[BUTTON_OPTION] = 0x01;
@@ -134,11 +162,14 @@ void JoystickExec(void)
 	if (keystate[vjs.p1KeyBindings[20]])
 		joypad_0_buttons[BUTTON_d] = 0x01;
 
-	extern bool debounceRunKey;
+#warning "!!! FIX !!! (debounceRunKey)"
+//	extern bool debounceRunKey;
+	bool debounceRunKey;
     if (keystate[SDLK_ESCAPE])
     {
 		if (!debounceRunKey)
-	    	finished = true;
+#warning "!!! FIX !!! (finished = true)"
+;//	    	finished = true;
     }
     else
 		debounceRunKey = false;
@@ -146,7 +177,8 @@ void JoystickExec(void)
 	if (keystate[SDLK_TAB])
 	{
 		if (!GUIKeyHeld)
-			showGUI = !showGUI, GUIKeyHeld = true;
+#warning "!!! FIX !!! (showGUI = !showGUI, ...)"
+;//			showGUI = !showGUI, GUIKeyHeld = true;
 	}
 	else
 		GUIKeyHeld = false;
@@ -233,9 +265,9 @@ void JoystickExec(void)
 
     if (vjs.useJoystick)
     {
-		extern SDL_Joystick * joystick;
-		int16 x = SDL_JoystickGetAxis(joystick, 0),
-			y = SDL_JoystickGetAxis(joystick, 1);
+		extern SDL_Joystick * joystick1;
+		int16 x = SDL_JoystickGetAxis(joystick1, 0),
+			y = SDL_JoystickGetAxis(joystick1, 1);
 
 		if (x > 16384)
 			joypad_0_buttons[BUTTON_R] = 0x01;
@@ -246,11 +278,11 @@ void JoystickExec(void)
 		if (y < -16384)
 			joypad_0_buttons[BUTTON_U] = 0x01;
 
-		if (SDL_JoystickGetButton(joystick, 0) == SDL_PRESSED)
+		if (SDL_JoystickGetButton(joystick1, 0) == SDL_PRESSED)
 			joypad_0_buttons[BUTTON_A] = 0x01;
-		if (SDL_JoystickGetButton(joystick, 1) == SDL_PRESSED)
+		if (SDL_JoystickGetButton(joystick1, 1) == SDL_PRESSED)
 			joypad_0_buttons[BUTTON_B] = 0x01;
-		if (SDL_JoystickGetButton(joystick, 2) == SDL_PRESSED)
+		if (SDL_JoystickGetButton(joystick1, 2) == SDL_PRESSED)
 			joypad_0_buttons[BUTTON_C] = 0x01;
 	}