From fa50efa93b11540ab8ab6ed7ccc8a4546d95b7bb Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 18 Apr 2013 23:54:15 +0200 Subject: [PATCH] (PS3/XDK) Don't rely on frame_count anymore for menu toggle --- ps3/ps3_input.c | 7 ++----- xdk/xdk_xinput_input.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index ae145a53ee..8fd719383a 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -216,11 +216,8 @@ static void ps3_input_poll(void *data) *lifecycle_state |= (1ULL << RARCH_REWIND); } - if (!(g_extern.frame_count < g_extern.delay_timer[0])) - { - if ((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) - *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); - } + if ((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) + *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); cellPadGetInfo2(&pad_info); pads_connected = pad_info.now_connect; diff --git a/xdk/xdk_xinput_input.c b/xdk/xdk_xinput_input.c index df79ba79c2..b84a40c1c6 100644 --- a/xdk/xdk_xinput_input.c +++ b/xdk/xdk_xinput_input.c @@ -238,11 +238,8 @@ static void xdk_input_poll(void *data) *lifecycle_state |= (1ULL << RARCH_REWIND); } - if (!(g_extern.frame_count < g_extern.delay_timer[0])) - { - if((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) - *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); - } + if((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) + *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); } static int16_t xdk_input_state(void *data, const struct retro_keybind **binds,