CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-10 13:02:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(PS3 Input) Take out unnecessary custom menu binds

Browse Source
This commit is contained in:
twinaphex 2014-06-08 06:09:10 +02:00
parent d3c09a30f6
commit dbf59930cf
1 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
input/ps3_input.c
View File

@ -335,49 +335,6 @@ static int16_t ps3_mouse_device_state(void *data, unsigned player, unsigned id)
#endif
static bool ps3_menu_input_state(uint64_t joykey, uint64_t state)
{
switch (joykey)
{
case CONSOLE_MENU_A:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_A);
case CONSOLE_MENU_B:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_B);
case CONSOLE_MENU_X:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_X);
case CONSOLE_MENU_Y:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y);
case CONSOLE_MENU_START:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_START);
case CONSOLE_MENU_SELECT:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT);
case CONSOLE_MENU_UP:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_UP);
case CONSOLE_MENU_DOWN:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN);
case CONSOLE_MENU_LEFT:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT);
case CONSOLE_MENU_RIGHT:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT);
case CONSOLE_MENU_L:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L);
case CONSOLE_MENU_R:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R);
case CONSOLE_MENU_HOME:
return (state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3));
case CONSOLE_MENU_L2:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L2);
case CONSOLE_MENU_R2:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R2);
case CONSOLE_MENU_L3:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3);
case CONSOLE_MENU_R3:
return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3);
default:
return false;
}
}
static int16_t ps3_input_state(void *data, const struct retro_keybind **binds,
unsigned port, unsigned device,
unsigned index, unsigned id)
@ -393,10 +350,7 @@ static int16_t ps3_input_state(void *data, const struct retro_keybind **binds,
switch (device)
{
case RETRO_DEVICE_JOYPAD:
if (binds[port][id].joykey >= CONSOLE_MENU_FIRST && binds[port][id].joykey <= CONSOLE_MENU_LAST)
return ps3_menu_input_state(binds[port][id].joykey, ps3->pad_state[port]) ? 1 : 0;
else
return input_joypad_pressed(&ps3_joypad, port, binds[port], id);
return input_joypad_pressed(&ps3_joypad, port, binds[port], id);
case RETRO_DEVICE_ANALOG:
return input_joypad_analog(&ps3_joypad, port, index, id, binds[port]);
#if 0