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

tree 0c86a223596d

Browse source 
parent 44e12dd8ee8e
author Edward Rudd <urkle@outoforder.cc> 1358030047 18000
committer Edward Rudd <urkle@outoforder.cc> 1358030047 18000
revision 6821
branch default

Fix a bad mapping from "axis" to "button"
This commit is contained in:
Sam Lantinga 2013-02-11 11:21:19 -08:00
parent 65399f4c26
commit 290c391df5
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/joystick/SDL_gamecontroller.c
View file

@ -53,18 +53,20 @@ struct _SDL_ControllerMapping
// mapping of axis/button id to controller version // mapping of axis/button id to controller version
int axes[SDL_CONTROLLER_AXIS_MAX]; int axes[SDL_CONTROLLER_AXIS_MAX];
int buttons[SDL_CONTROLLER_BUTTON_MAX]; int buttonasaxis[SDL_CONTROLLER_AXIS_MAX];
int buttons[SDL_CONTROLLER_BUTTON_MAX];
int axesasbutton[SDL_CONTROLLER_BUTTON_MAX]; int axesasbutton[SDL_CONTROLLER_BUTTON_MAX];
struct _SDL_HatAsButton hatasbutton[SDL_CONTROLLER_BUTTON_MAX]; struct _SDL_HatAsButton hatasbutton[SDL_CONTROLLER_BUTTON_MAX];
int buttonasaxis[SDL_CONTROLLER_AXIS_MAX];
// reverse mapping, joystick indices to buttons // reverse mapping, joystick indices to buttons
SDL_CONTROLLER_AXIS raxes[k_nMaxReverseEntries]; SDL_CONTROLLER_AXIS raxes[k_nMaxReverseEntries];
SDL_CONTROLLER_AXIS rbuttonasaxis[k_nMaxReverseEntries];
SDL_CONTROLLER_BUTTON rbuttons[k_nMaxReverseEntries]; SDL_CONTROLLER_BUTTON rbuttons[k_nMaxReverseEntries];
SDL_CONTROLLER_BUTTON raxesasbutton[k_nMaxReverseEntries]; SDL_CONTROLLER_BUTTON raxesasbutton[k_nMaxReverseEntries];
struct _SDL_HatAsButton rhatasbutton[k_nMaxReverseEntries]; struct _SDL_HatAsButton rhatasbutton[k_nMaxReverseEntries];
SDL_CONTROLLER_AXIS rbuttonasaxis[k_nMaxReverseEntries];
}; };
@ -355,8 +357,8 @@ void SDL_PrivateGameControllerParseButton( const char *szGameButton, const char
} }
else if ( button != SDL_CONTROLLER_BUTTON_INVALID ) else if ( button != SDL_CONTROLLER_BUTTON_INVALID )
{ {
pMapping->buttonasaxis[ button ] = iSDLButton; pMapping->axesasbutton[ button ] = iSDLButton;
pMapping->rbuttonasaxis[ iSDLButton ] = button; pMapping->raxesasbutton[ iSDLButton ] = button;
} }
else else
{ {
@ -494,10 +496,10 @@ void SDL_PrivateLoadButtonMapping( struct _SDL_ControllerMapping *pMapping, SDL_
for ( j = 0; j < k_nMaxReverseEntries; j++ ) for ( j = 0; j < k_nMaxReverseEntries; j++ )
{ {
pMapping->raxes[j] = SDL_CONTROLLER_AXIS_INVALID; pMapping->raxes[j] = SDL_CONTROLLER_AXIS_INVALID;
pMapping->rbuttonasaxis[j] = SDL_CONTROLLER_AXIS_INVALID;
pMapping->rbuttons[j] = SDL_CONTROLLER_BUTTON_INVALID; pMapping->rbuttons[j] = SDL_CONTROLLER_BUTTON_INVALID;
pMapping->raxesasbutton[j] = SDL_CONTROLLER_BUTTON_INVALID; pMapping->raxesasbutton[j] = SDL_CONTROLLER_BUTTON_INVALID;
pMapping->rhatasbutton[j].hat = -1; pMapping->rhatasbutton[j].hat = -1;
pMapping->rbuttonasaxis[j] = SDL_CONTROLLER_AXIS_INVALID;
} }
SDL_PrivateGameControllerParseControllerConfigString( pMapping, pchMapping ); SDL_PrivateGameControllerParseControllerConfigString( pMapping, pchMapping );