mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-09 18:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Themaister/SSNES

Browse Source
This commit is contained in:
Themaister 2012-01-13 00:09:13 +01:00
commit 072406e3c3
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ps3/ps3_input.c
View File

@ -39,17 +39,27 @@ static int16_t ps3_input_state(void *data, const struct snes_keybind **binds,
(void)binds; (void)binds;
(void)index; (void)index;
unsigned pads_connected, player;
uint64_t button;
player = 0;
pads_connected = cell_pad_input_pads_connected();
if (device != SNES_DEVICE_JOYPAD) if (device != SNES_DEVICE_JOYPAD)
return 0; return 0;
unsigned player = 0; if (port == SNES_PORT_2)
if (port == SNES_PORT_2 && device == SNES_DEVICE_MULTITAP) {
player = index + 1; if(pads_connected < 2)
else if (port == SNES_PORT_2) return 0;
player = 1;
if(device != SNES_DEVICE_MULTITAP)
player = 1;
else
player = index + 1;
}
// Hardcoded binds. // Hardcoded binds.
uint64_t button;
switch (id) switch (id)
{ {
case SNES_DEVICE_ID_JOYPAD_A: case SNES_DEVICE_ID_JOYPAD_A:
@ -90,6 +100,7 @@ static int16_t ps3_input_state(void *data, const struct snes_keybind **binds,
break; break;
default: default:
button = 0; button = 0;
break;
} }
return CTRL_MASK(state[player], button) ? 1 : 0; return CTRL_MASK(state[player], button) ? 1 : 0;