[patch] files/1.1.0-settings.patch

1.1.0-settings.patch (text/plain), 970 bytes, created by Pau Rodriguez on 2005-07-19 05:30:21 UTC

--- trackballs-1.1.0/src/settings.cc	2005-02-27 13:35:51.000000000 +0100
+++ trackballs-1.1.0-2/src/settings.cc	2005-07-19 13:28:55.000000000 +0200
@@ -196,14 +196,23 @@
 }
 
 int Settings::hasJoystick() { 
-  if(!Settings::settings->joystickIndex) return 0;
-
-  if(!joystick) 
-	joystick = SDL_JoystickOpen(Settings::settings->joystickIndex-1);  
-  if(!joystick) {
-	printf("Warning, failed to open joystick no. %d\n",Settings::settings->joystickIndex-1);
-	joystickIndex=0;
-  }
+	if (SDL_NumJoysticks() > 0) 
+	{ 
+	joystick=SDL_JoystickOpen(0); 
+	if (joystick) 
+	{ 
+		SDL_JoystickEventState(SDL_ENABLE); 
+		Settings::settings->joystickIndex = 1; 
+		Settings::save(); 
+		return 1; 
+	} 
+	else 
+	{ 
+		printf("Warning, failed to open joystick no. %d\n",Settings::settings->joystickIndex-1); 
+		joystickIndex=0; 
+		return 0; 
+	} 
+} 
   return joystickIndex; 
 }
 void Settings::closeJoystick() { if(joystick) SDL_JoystickClose(joystick); joystick=NULL; }