ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(PS3) No longer crashes on loading overlays

This commit is contained in:
twinaphex 2013-11-07 05:21:09 +01:00
parent e668693e42
commit 68fbbbd7f4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ps3/ps3_input.c
View File

@ -198,8 +198,7 @@ static int16_t ps3_input_state(void *data, const struct retro_keybind **binds,
unsigned index, unsigned id) unsigned index, unsigned id)
{ {
ps3_input_t *ps3 = (ps3_input_t*)data; ps3_input_t *ps3 = (ps3_input_t*)data;
uint64_t button;
uint64_t button = binds[port][id].joykey;
int16_t retval = 0; int16_t retval = 0;
if (port < ps3->pads_connected) if (port < ps3->pads_connected)
@ -207,6 +206,7 @@ static int16_t ps3_input_state(void *data, const struct retro_keybind **binds,
switch (device) switch (device)
{ {
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
button = binds[port][id].joykey;
retval = (ps3->state[port] & button) ? 1 : 0; retval = (ps3->state[port] & button) ? 1 : 0;
break; break;
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
@ -236,6 +236,8 @@ static int16_t ps3_input_state(void *data, const struct retro_keybind **binds,
retval = ps3_mouse_device_state(data, port, id); retval = ps3_mouse_device_state(data, port, id);
break; break;
#endif #endif
default:
return 0;
} }
} }