From 11e2577a879556bf3d82ce116f90a6abae519adf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 27 Apr 2013 22:49:43 +0200 Subject: [PATCH] (RMenu XUI) Add menu toggle hack for now --- frontend/menu/rmenu_xui.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index b3537f709e..2e15b8ab87 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -1728,6 +1728,8 @@ bool menu_iterate(void) { input_loop = INPUT_LOOP_MENU; g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_PREINIT); + /* FIXME - hack for now */ + rgui->delay_count = 0; } XINPUT_STATE state; @@ -1750,16 +1752,18 @@ bool menu_iterate(void) process_input_ret = -1; } - 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)) + /* FIXME - hack for now */ + if (rgui->delay_count > 30) { - if (rmenu_enable) - { - g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); - process_input_ret = -1; - } + bool rmenu_enable = ((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) && + (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) + ) && g_extern.main_is_init; + + if (rmenu_enable) + { + g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME); + process_input_ret = -1; + } } switch(input_loop) @@ -1787,6 +1791,9 @@ bool menu_iterate(void) if (driver.video_poke && driver.video_poke->set_texture_enable) driver.video_poke->set_texture_enable(driver.video_data, false, true); + /* FIXME - hack for now */ + rgui->delay_count++; + if(process_input_ret != 0) goto deinit;