diff src/haptic/SDL_haptic.c @ 2491:10bc7aaf5114 gsoc2008_force_feedback

Commented SDL_syshaptic.h. Removed SDL_haptic_c.h (no private functions). Fixed bug with SDL_HapticFromJoystick().
author Edgar Simo <bobbens@gmail.com>
date Wed, 02 Jul 2008 10:26:35 +0000
parents be9b206d44af
children 66c02abeef0e
line wrap: on
line diff
--- a/src/haptic/SDL_haptic.c	Wed Jul 02 09:52:44 2008 +0000
+++ b/src/haptic/SDL_haptic.c	Wed Jul 02 10:26:35 2008 +0000
@@ -21,7 +21,6 @@
 */
 #include "SDL_config.h"
 
-#include "SDL_haptic_c.h"
 #include "SDL_syshaptic.h"
 #include "../joystick/SDL_joystick_c.h" /* For SDL_PrivateJoystickValid */
 
@@ -173,7 +172,7 @@
 
    /* Check to see if joystick's haptic is already open */
    for (i=0; SDL_haptics[i]; i++) {
-      if (SDL_SYS_JoystickSameHaptic(&SDL_haptics[i],joystick)) {
+      if (SDL_SYS_JoystickSameHaptic(SDL_haptics[i],joystick)) {
          haptic = SDL_haptics[i];
          ++haptic->ref_count;
          return haptic;