X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=dc498d02134d87aeaeca92acb5d01185e8ef3203;hb=166019baeee39e3867ecf6c4eddd0855dc3507a4;hp=0a391b0bd00f979641e11a81764e05f306bc1e60;hpb=ea10984eaf09364d9f6e08114caa4bcfcaa72d9e;p=virtualjaguar

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 0a391b0..dc498d0 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -18,36 +18,9 @@
 #include <SDL.h>
 #include <time.h>
 #include "gpu.h"
-//#include "gui.h"
 #include "jaguar.h"
 #include "log.h"
 #include "settings.h"
-#include "video.h"
-
-#if 0
-#define BUTTON_U		0
-#define BUTTON_D		1
-#define BUTTON_L		2
-#define BUTTON_R		3
-#define BUTTON_s		4
-#define BUTTON_7		5
-#define BUTTON_4		6
-#define BUTTON_1		7
-#define BUTTON_0		8
-#define BUTTON_8		9
-#define BUTTON_5		10
-#define BUTTON_2		11
-#define BUTTON_d		12
-#define BUTTON_9		13
-#define BUTTON_6		14
-#define BUTTON_3		15
-
-#define BUTTON_A		16
-#define BUTTON_B		17
-#define BUTTON_C		18
-#define BUTTON_OPTION	19
-#define BUTTON_PAUSE	20
-#endif
 
 // Global vars
 
@@ -57,6 +30,8 @@ uint8 joypad_1_buttons[21];
 
 bool keyBuffer[21];
 
+SDL_Joystick * joystick1;
+
 //extern bool finished;
 ////extern bool showGUI;
 bool GUIKeyHeld = false;