include/SDL_joystick.h
changeset 6707 70eeb7e3ec2f
parent 6690 9548c8a58103
child 6738 b408d5a406a3
     1.1 --- a/include/SDL_joystick.h	Mon Nov 26 23:58:53 2012 -0800
     1.2 +++ b/include/SDL_joystick.h	Tue Nov 27 00:58:12 2012 -0800
     1.3 @@ -62,8 +62,14 @@
     1.4  struct _SDL_Joystick;
     1.5  typedef struct _SDL_Joystick SDL_Joystick;
     1.6  
     1.7 +/* A structure that encodes the stable unique id for a joystick device */
     1.8 +typedef struct {
     1.9 +	Uint8 data[16];
    1.10 +} JoystickGUID;
    1.11 +
    1.12  typedef int SDL_JoystickID;
    1.13 -	
    1.14 +
    1.15 +
    1.16  /* Function prototypes */
    1.17  /**
    1.18   *  Count the number of joysticks attached to the system right now
    1.19 @@ -93,12 +99,6 @@
    1.20   */
    1.21  extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick);
    1.22  	
    1.23 -/* A structure that encodes the stable unique id for a joystick device */
    1.24 -typedef struct
    1.25 -{
    1.26 -	Uint8 data[16];
    1.27 -} JoystickGUID;
    1.28 -
    1.29  /**
    1.30   *  Return the GUID for the joystick at this index
    1.31   */
    1.32 @@ -119,14 +119,13 @@
    1.33   */
    1.34  extern DECLSPEC JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID);
    1.35  
    1.36 +/**
    1.37 + *  Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not.
    1.38 + */
    1.39 +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick);
    1.40  
    1.41  /**
    1.42 - *  Returns 1 if the joystick has been opened and currently connected, or 0 if it has not.
    1.43 - */
    1.44 -extern DECLSPEC int SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick);
    1.45 -
    1.46 -/**
    1.47 - *  Get the device index of an opened joystick.
    1.48 + *  Get the instance ID of an opened joystick.
    1.49   */
    1.50  extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick);
    1.51