Index: code/io/joy_ff-sdl.cpp
===================================================================
--- code/io/joy_ff-sdl.cpp	(revision 10795)
+++ code/io/joy_ff-sdl.cpp	(working copy)
@@ -24,6 +24,7 @@
 #endif
 
 extern SDL_Joystick *sdljoy;
+extern int Cur_joystick;
 
 static int Joy_ff_enabled = 0;
 static SDL_Haptic *haptic = NULL;
@@ -67,20 +68,20 @@
 	mprintf(("  Initializing Haptic...\n"));
 
 	if (SDL_InitSubSystem(SDL_INIT_HAPTIC) < 0) {
-		mprintf(("    ERROR: Could not initialize Haptic subsystem\n"));
+		mprintf(("    ERROR: Could not initialize Haptic subsystem: %s\n", SDL_GetError()));
 		return -1;
 	}
 
 	if ( !SDL_JoystickIsHaptic(sdljoy) ) {
-		mprintf(("    ERROR: Joystick does not have haptic capabilities\n"));
+		mprintf(("    ERROR: Joystick does not have haptic capabilities: %s\n", SDL_GetError()));
 		SDL_QuitSubSystem(SDL_INIT_HAPTIC);
 		return -1;
 	}
 
-	haptic = SDL_HapticOpenFromJoystick(sdljoy);
+	haptic = SDL_HapticOpen(Cur_joystick);
 
 	if (haptic == NULL) {
-		mprintf(("    ERROR: Unable to open haptic joystick\n"));
+		mprintf(("    ERROR: Unable to open haptic joystick %d: %s\n", Cur_joystick, SDL_GetError()));
 		SDL_QuitSubSystem(SDL_INIT_HAPTIC);
 		return -1;
 	}
Index: projects/MSVC_2008/code.vcproj
===================================================================
--- projects/MSVC_2008/code.vcproj	(revision 10795)
+++ projects/MSVC_2008/code.vcproj	(working copy)
@@ -1886,10 +1886,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\code\osapi\osapi_unix.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\code\osapi\osregistry.cpp"
 				>
 			</File>