ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu_iterate) Cleanups

This commit is contained in:
twinaphex 2015-09-26 23:16:21 +02:00
parent 12075b9cc1
commit a1a1fbc6b9
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/menu_iterate.c
View File

@ -447,8 +447,6 @@ int menu_iterate(bool render_this_frame, unsigned action)
{ {
case ITERATE_TYPE_HELP: case ITERATE_TYPE_HELP:
ret = action_iterate_help(menu->menu_state.msg, sizeof(menu->menu_state.msg), label); ret = action_iterate_help(menu->menu_state.msg, sizeof(menu->menu_state.msg), label);
if (render_this_frame)
BIT64_SET(menu->state, MENU_STATE_BLIT);
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX); BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
BIT64_SET(menu->state, MENU_STATE_POP_STACK); BIT64_SET(menu->state, MENU_STATE_POP_STACK);
BIT64_SET(menu->state, MENU_STATE_POST_ITERATE); BIT64_SET(menu->state, MENU_STATE_POST_ITERATE);
@ -463,19 +461,13 @@ int menu_iterate(bool render_this_frame, unsigned action)
} }
else else
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX); BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
if (render_this_frame)
BIT64_SET(menu->state, MENU_STATE_BLIT);
break; break;
case ITERATE_TYPE_VIEWPORT: case ITERATE_TYPE_VIEWPORT:
ret = action_iterate_menu_viewport(menu->menu_state.msg, sizeof(menu->menu_state.msg), label, action, hash); ret = action_iterate_menu_viewport(menu->menu_state.msg, sizeof(menu->menu_state.msg), label, action, hash);
if (render_this_frame)
BIT64_SET(menu->state, MENU_STATE_BLIT);
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX); BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
break; break;
case ITERATE_TYPE_INFO: case ITERATE_TYPE_INFO:
ret = action_iterate_info(menu->menu_state.msg, sizeof(menu->menu_state.msg), label); ret = action_iterate_info(menu->menu_state.msg, sizeof(menu->menu_state.msg), label);
if (render_this_frame)
BIT64_SET(menu->state, MENU_STATE_BLIT);
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX); BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
BIT64_SET(menu->state, MENU_STATE_POP_STACK); BIT64_SET(menu->state, MENU_STATE_POP_STACK);
BIT64_SET(menu->state, MENU_STATE_POST_ITERATE); BIT64_SET(menu->state, MENU_STATE_POST_ITERATE);
@ -488,8 +480,6 @@ int menu_iterate(bool render_this_frame, unsigned action)
goto end; goto end;
BIT64_SET(menu->state, MENU_STATE_POST_ITERATE); BIT64_SET(menu->state, MENU_STATE_POST_ITERATE);
if (render_this_frame)
BIT64_SET(menu->state, MENU_STATE_BLIT);
/* Have to defer it so we let settings refresh. */ /* Have to defer it so we let settings refresh. */
if (menu->push_help_screen) if (menu->push_help_screen)
@ -506,6 +496,9 @@ int menu_iterate(bool render_this_frame, unsigned action)
break; break;
} }
if (render_this_frame)
BIT64_SET(menu->state, MENU_STATE_BLIT);
if (BIT64_GET(menu->state, MENU_STATE_POP_STACK) && action == MENU_ACTION_OK) if (BIT64_GET(menu->state, MENU_STATE_POP_STACK) && action == MENU_ACTION_OK)
{ {
size_t new_selection_ptr = selection; size_t new_selection_ptr = selection;