X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=057d059bf7ef756aa09dd20f68373a4837d99442;hb=b79146c85ed8f85acc80fe56534f72cd777f0b02;hp=aa81c0ff3ebc107412ba38e365a80dd6735bd759;hpb=d239de704f276a75d927900e3d413a44cc87116c;p=virtualjaguar

diff --git a/src/joystick.cpp b/src/joystick.cpp
index aa81c0f..057d059 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"
@@ -134,11 +141,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 +156,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 +244,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 +257,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;
 	}
 
@@ -271,7 +282,7 @@ void JoystickDone(void)
 
 uint8 JoystickReadByte(uint32 offset)
 {
-#warning No bounds checking done in JoystickReadByte!
+#warning "No bounds checking done in JoystickReadByte!"
 //	extern bool hardwareTypeNTSC;
 	offset &= 0x03;
 
@@ -282,6 +293,10 @@ uint8 JoystickReadByte(uint32 offset)
 		int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
 
 // This is bad--we're assuming that a bit is set in the last case. Might not be so!
+// NOTE: values $7, B, D, & E are only legal ones for pad 0, (rows 3 to 0, in both cases)
+//              $E, D, B, & 7 are only legal ones for pad 1
+//       So the following code is WRONG!
+
 		if (!(pad0Index & 0x01))
 			pad0Index = 0;
 		else if (!(pad0Index & 0x02))
@@ -318,6 +333,7 @@ uint8 JoystickReadByte(uint32 offset)
 		int pad0Index = joystick_ram[1] & 0x0F;
 //unused		int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
 
+//WTF is this shit?
 		if (!(pad0Index & 0x01))
 		{
 			if (joypad_0_buttons[BUTTON_PAUSE])
@@ -340,6 +356,7 @@ uint8 JoystickReadByte(uint32 offset)
 			if (joypad_0_buttons[BUTTON_OPTION])
 				data ^= 0x02;
 		}
+
 		return data;
 	}
 
@@ -358,7 +375,7 @@ void JoystickWriteByte(uint32 offset, uint8 data)
 
 void JoystickWriteWord(uint32 offset, uint16 data)
 {
-#warning No bounds checking done for JoystickWriteWord!
+#warning "No bounds checking done for JoystickWriteWord!"
 	offset &= 0x03;
 	joystick_ram[offset + 0] = (data >> 8) & 0xFF;
 	joystick_ram[offset + 1] = data & 0xFF;