X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fjoystick.cpp;h=208b58b2be51cb5ecbfca18f5206312c2455772e;hb=f91072f8bd3a65d56cfb94eb022577f3f42016c6;hp=66be33097e6af28452a56a68e62b4b35cacedc34;hpb=07e61d8dcf16099a862baee79b4ec1e06d76b3d4;p=virtualjaguar

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 66be330..208b58b 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -3,10 +3,10 @@
 //
 // by cal2
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups/fixes by James L. Hammons
+// Cleanups/fixes by James Hammons
 // (C) 2010 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
@@ -283,6 +283,8 @@ void JoystickExec(void)
 		joypad_0_buttons[BUTTON_D] = 0;
 #endif
 
+// This is handled by the GUI layer, as it should
+#if 0
 	// Joystick support [nwagenaar]
 
     if (vjs.useJoystick)
@@ -310,6 +312,7 @@ void JoystickExec(void)
 
 	// Needed to ensure that the events queue is empty [nwagenaar]
     SDL_PumpEvents();
+#endif
 }
 
 void JoystickReset(void)