pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the joystick id usage in the joystick and game controller events.

Browse source
This commit is contained in:
Sam Lantinga 2013-03-02 17:51:32 -08:00
parent c6dc8b64e7
commit c02018f852
4 changed files with 46 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/joystick/SDL_sysjoystick.h
View file

@ -28,8 +28,8 @@
/* The SDL joystick structure */
struct _SDL_Joystick
{
int instance_id; /* Device instance, monotonically increasing from 0 */
char *name; /* Joystick name - system dependent */
SDL_JoystickID instance_id; /* Device instance, monotonically increasing from 0 */
char *name; /* Joystick name - system dependent */
int naxes; /* Number of axis controls on the joystick */
Sint16 *axes; /* Current axis states */
@ -38,8 +38,7 @@ struct _SDL_Joystick
Uint8 *hats; /* Current hat states */
int nballs; /* Number of trackballs on the joystick */
struct balldelta
{
struct balldelta {
int dx;
int dy;
} *balls; /* Current ball motion deltas */
@ -50,10 +49,10 @@ struct _SDL_Joystick
struct joystick_hwdata *hwdata; /* Driver dependent information */
int ref_count; /* Reference count for multiple opens */
Uint8 closed; /* 1 if this device is no longer valid */
Uint8 uncentered; /* 1 if this device needs to have its state reset to 0 */
struct _SDL_Joystick *next; /* pointer to next joystick we have allocated */
Uint8 closed; /* 1 if this device is no longer valid */
Uint8 uncentered; /* 1 if this device needs to have its state reset to 0 */
struct _SDL_Joystick *next; /* pointer to next joystick we have allocated */
};
/* Function to scan the system for joysticks.