include/SDL_gamecontroller.h
changeset 6932 361bebe92c66
parent 6919 c9c75d062fa8
child 6964 c8aa24f05042
     1.1 --- a/include/SDL_gamecontroller.h	Tue Feb 26 20:32:11 2013 -0800
     1.2 +++ b/include/SDL_gamecontroller.h	Tue Feb 26 20:41:28 2013 -0800
     1.3 @@ -62,23 +62,20 @@
     1.4  } SDL_GameControllerBindType;
     1.5  
     1.6  /**
     1.7 - *  get the sdl joystick layer binding for this controller button/axis mapping
     1.8 + *  Get the SDL joystick layer binding for this controller button/axis mapping
     1.9   */
    1.10 -struct _SDL_GameControllerHatBind
    1.11 +typedef struct SDL_GameControllerButtonBind
    1.12  {
    1.13 -	int hat;
    1.14 -	int hat_mask;
    1.15 -};
    1.16 -
    1.17 -typedef struct _SDL_GameControllerButtonBind
    1.18 -{
    1.19 -	SDL_GameControllerBindType m_eBindType;
    1.20 +	SDL_GameControllerBindType bindType;
    1.21  	union
    1.22  	{
    1.23  		int button;
    1.24  		int axis;
    1.25 -		struct _SDL_GameControllerHatBind hat;
    1.26 -	};
    1.27 +		struct {
    1.28 +            int hat;
    1.29 +            int hat_mask;
    1.30 +        } hat;
    1.31 +	} value;
    1.32  
    1.33  } SDL_GameControllerButtonBind;
    1.34  
    1.35 @@ -190,7 +187,7 @@
    1.36  extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString);
    1.37  
    1.38  /**
    1.39 - *  get the sdl joystick layer binding for this controller button mapping
    1.40 + *  Get the SDL joystick layer binding for this controller button mapping
    1.41   */
    1.42  extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
    1.43  SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller,
    1.44 @@ -238,7 +235,7 @@
    1.45  
    1.46  
    1.47  /**
    1.48 - *  get the sdl joystick layer binding for this controller button mapping
    1.49 + *  Get the SDL joystick layer binding for this controller button mapping
    1.50   */
    1.51  extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
    1.52  SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller,