src/haptic/windows/SDL_syshaptic.c
changeset 7191 75360622e65f
parent 7132 1415923c2eab
child 7319 8bdc5aac93d7
     1.1 --- a/src/haptic/windows/SDL_syshaptic.c	Sat May 18 12:48:50 2013 -0700
     1.2 +++ b/src/haptic/windows/SDL_syshaptic.c	Sat May 18 14:17:52 2013 -0700
     1.3 @@ -41,8 +41,8 @@
     1.4      char *name;
     1.5      SDL_Haptic *haptic;
     1.6      DIDEVCAPS capabilities;
     1.7 -    Uint8 bXInputHaptic; // Supports force feedback via XInput.
     1.8 -    Uint8 userid; // XInput userid index for this joystick
     1.9 +    Uint8 bXInputHaptic; /* Supports force feedback via XInput. */
    1.10 +    Uint8 userid; /* XInput userid index for this joystick */
    1.11  } SDL_hapticlist[MAX_HAPTICS];
    1.12  
    1.13  
    1.14 @@ -54,8 +54,8 @@
    1.15      LPDIRECTINPUTDEVICE8 device;
    1.16      DWORD axes[3];              /* Axes to use. */
    1.17      int is_joystick;            /* Device is loaded as joystick. */
    1.18 -    Uint8 bXInputHaptic; // Supports force feedback via XInput.
    1.19 -    Uint8 userid; // XInput userid index for this joystick
    1.20 +    Uint8 bXInputHaptic; /* Supports force feedback via XInput. */
    1.21 +    Uint8 userid; /* XInput userid index for this joystick */
    1.22  };
    1.23  
    1.24  
    1.25 @@ -107,7 +107,7 @@
    1.26  static BOOL CALLBACK DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv);
    1.27  
    1.28  
    1.29 -/* 
    1.30 +/*
    1.31   * Like SDL_SetError but for DX error codes.
    1.32   */
    1.33  static int
    1.34 @@ -732,7 +732,7 @@
    1.35  }
    1.36  
    1.37  
    1.38 -/* 
    1.39 +/*
    1.40   * Clean up after system specific haptic stuff
    1.41   */
    1.42  void
    1.43 @@ -1264,12 +1264,13 @@
    1.44      DIEFFECT temp;
    1.45  
    1.46      if (haptic->hwdata->bXInputHaptic) {
    1.47 -        // !!! FIXME: this isn't close to right. We only support "sine" effects,
    1.48 -        // !!! FIXME:  we ignore most of the parameters, and we probably get
    1.49 -        // !!! FIXME:  the ones we don't ignore wrong, too.
    1.50 -        // !!! FIXME: if I had a better understanding of how the two motors
    1.51 -        // !!! FIXME:  could be used in unison, perhaps I could implement other
    1.52 -        // !!! FIXME:  effect types?
    1.53 +        /* !!! FIXME: this isn't close to right. We only support "sine" effects,
    1.54 +         * !!! FIXME:  we ignore most of the parameters, and we probably get
    1.55 +         * !!! FIXME:  the ones we don't ignore wrong, too.
    1.56 +         * !!! FIXME: if I had a better understanding of how the two motors
    1.57 +         * !!! FIXME:  could be used in unison, perhaps I could implement other
    1.58 +         * !!! FIXME:  effect types?
    1.59 +         */
    1.60          /* From MSDN:
    1.61              "Note that the right motor is the high-frequency motor, the left
    1.62               motor is the low-frequency motor. They do not always need to be
    1.63 @@ -1528,5 +1529,6 @@
    1.64      return 0;
    1.65  }
    1.66  
    1.67 +#endif /* SDL_HAPTIC_DINPUT */
    1.68  
    1.69 -#endif /* SDL_HAPTIC_DINPUT */
    1.70 +/* vi: set ts=4 sw=4 expandtab: */