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

Fixed gcc pedantic warnings in public headers

Browse source
This commit is contained in:
Sam Lantinga 2013-02-26 20:41:28 -08:00
parent a2dccaee2b
commit 2204530a1b
2 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/joystick/SDL_gamecontroller.c
View file

@ -945,13 +945,13 @@ SDL_GameControllerButtonBind SDL_GameControllerGetBindForAxis(SDL_GameController
if (gamecontroller->mapping.axes[axis] >= 0 )
{
bind.m_eBindType = SDL_CONTROLLER_BINDTYPE_AXIS;
bind.button = gamecontroller->mapping.axes[axis];
bind.bindType = SDL_CONTROLLER_BINDTYPE_AXIS;
bind.value.button = gamecontroller->mapping.axes[axis];
}
else if (gamecontroller->mapping.buttonasaxis[axis] >= 0 )
{
bind.m_eBindType = SDL_CONTROLLER_BINDTYPE_BUTTON;
bind.button = gamecontroller->mapping.buttonasaxis[axis];
bind.bindType = SDL_CONTROLLER_BINDTYPE_BUTTON;
bind.value.button = gamecontroller->mapping.buttonasaxis[axis];
}
return bind;
@ -971,19 +971,19 @@ SDL_GameControllerButtonBind SDL_GameControllerGetBindForButton(SDL_GameControll
if ( gamecontroller->mapping.buttons[button] >= 0 )
{
bind.m_eBindType = SDL_CONTROLLER_BINDTYPE_BUTTON;
bind.button = gamecontroller->mapping.buttons[button];
bind.bindType = SDL_CONTROLLER_BINDTYPE_BUTTON;
bind.value.button = gamecontroller->mapping.buttons[button];
}
else if ( gamecontroller->mapping.axesasbutton[button] >= 0 )
{
bind.m_eBindType = SDL_CONTROLLER_BINDTYPE_AXIS;
bind.axis = gamecontroller->mapping.axesasbutton[button];
bind.bindType = SDL_CONTROLLER_BINDTYPE_AXIS;
bind.value.axis = gamecontroller->mapping.axesasbutton[button];
}
else if ( gamecontroller->mapping.hatasbutton[button].hat >= 0 )
{
bind.m_eBindType = SDL_CONTROLLER_BINDTYPE_HAT;
bind.hat.hat = gamecontroller->mapping.hatasbutton[button].hat;
bind.hat.hat_mask = gamecontroller->mapping.hatasbutton[button].mask;
bind.bindType = SDL_CONTROLLER_BINDTYPE_HAT;
bind.value.hat.hat = gamecontroller->mapping.hatasbutton[button].hat;
bind.value.hat.hat_mask = gamecontroller->mapping.hatasbutton[button].mask;
}
return bind;