(Menu) Cleanups

This commit is contained in:
twinaphex 2015-06-15 17:00:31 +02:00
parent 84e2a6d983
commit e6a100e9a2
3 changed files with 3 additions and 12 deletions

View File

@ -22,10 +22,9 @@ static int action_info_default(unsigned type, const char *label)
{
menu_displaylist_info_t info = {0};
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu || !menu_list)
if (!menu_list)
return 0;
info.list = menu_list->menu_stack;

View File

@ -116,8 +116,8 @@ static int action_left_scroll(unsigned type, const char *label,
bool wraparound)
{
unsigned scroll_speed = 0, fast_scroll_speed = 0;
menu_list_t *menu_list = menu_list_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!nav || !menu_list)
return -1;
@ -256,9 +256,6 @@ static int action_left_cheat_num_passes(unsigned type, const char *label,
unsigned new_size = 0;
global_t *global = global_get_ptr();
cheat_manager_t *cheat = global->cheat;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
if (!cheat)
return -1;

View File

@ -145,13 +145,11 @@ static int action_right_mainmenu(unsigned type, const char *label,
{
menu_file_list_cbs_t *cbs = NULL;
unsigned push_list = 0;
menu_list_t *menu_list = menu_list_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
unsigned action = MENU_ACTION_RIGHT;
size_t list_size = menu_driver_list_get_size(MENU_LIST_PLAIN);
if (!menu)
return -1;
if (list_size == 1)
{
@ -261,9 +259,6 @@ static int action_right_cheat_num_passes(unsigned type, const char *label,
unsigned new_size = 0;
global_t *global = global_get_ptr();
cheat_manager_t *cheat = global->cheat;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
if (!cheat)
return -1;