mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-18 13:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop delay_timer

Browse Source
This commit is contained in:
twinaphex 2013-04-27 21:27:41 +02:00
parent 6b6dd4fc4e
commit cd9c6aa95d
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/menu/rmenu_xui.cpp
View File

@ -1750,17 +1750,16 @@ bool menu_iterate(void)
process_input_ret = -1;
}
if (!(g_extern.frame_count < g_extern.delay_timer[0]))
{
bool rmenu_enable = ((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB)
&& (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) && (g_extern.main_is_init));
bool rmenu_enable = ((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB)
&& (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) && (g_extern.main_is_init));
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
if (rmenu_enable)
{
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
process_input_ret = -1;
}
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
{
if (rmenu_enable)
{
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
process_input_ret = -1;
}
}
switch(input_loop)

2
general.h
View File

@ -524,8 +524,6 @@ struct global
} frame_cache;
unsigned frame_count;
// two timers, the first for handling menu and exit button delays, the second for scrolling delays
unsigned delay_timer[2];
char title_buf[64];
struct

11
gx/gx_input.c
View File

@ -730,15 +730,12 @@ static void gx_input_poll(void *data)
g_menu = false;
}
if (!(g_extern.frame_count < g_extern.delay_timer[0]))
{
if (*state_p1 & (GX_WIIMOTE_HOME
if (*state_p1 & (GX_WIIMOTE_HOME
#ifdef HW_RVL
| GX_CLASSIC_HOME
| GX_CLASSIC_HOME
#endif
))
*lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
}
))
*lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
}
static bool gx_input_key_pressed(void *data, int key)