mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Zarch) Buildfix

Browse Source
This commit is contained in:
twinaphex 2018-04-10 22:12:58 +02:00
parent 8d6067b1d4
commit a3175a8fa3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/drivers/zarch.c
View File

@ -531,7 +531,11 @@ static int zarch_zui_render_lay_root_recent(
tabbed->tabline_size + j * ZUI_ITEM_SIZE_PX, tabbed->tabline_size + j * ZUI_ITEM_SIZE_PX,
rich_label, i, entry_value, gamepad_index == (signed)i)) rich_label, i, entry_value, gamepad_index == (signed)i))
{ {
if (menu_entry_action(&entry, i, MENU_ACTION_OK)) menu_handle_t *menu = (menu_handle_t*)NULL;
menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu);
if (menu_entry_action(&entry, menu, i, MENU_ACTION_OK))
{ {
menu_entry_free(&entry); menu_entry_free(&entry);
if (!string_is_empty(rich_label)) if (!string_is_empty(rich_label))
@ -1084,7 +1088,7 @@ static bool zarch_load_image(void *userdata,
&zui->textures.bg); &zui->textures.bg);
break; break;
case MENU_IMAGE_THUMBNAIL: case MENU_IMAGE_THUMBNAIL:
break; case MENU_IMAGE_LEFT_THUMBNAIL:
case MENU_IMAGE_SAVESTATE_THUMBNAIL: case MENU_IMAGE_SAVESTATE_THUMBNAIL:
/* TODO/FIXME -implement */ /* TODO/FIXME -implement */
break; break;
@ -1093,10 +1097,10 @@ static bool zarch_load_image(void *userdata,
return true; return true;
} }
static void zarch_context_reset(void *data, bool is_threaded) static void zarch_context_reset(void *data, void *userdata, bool is_threaded)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
zui_t *zui = (zui_t*)data; zui_t *zui = (zui_t*)userdata;
if (!zui || !settings) if (!zui || !settings)
return; return;
@ -1118,6 +1122,7 @@ static int zarch_iterate(void *data, void *userdata, enum menu_action action)
{ {
int ret; int ret;
menu_entry_t entry; menu_entry_t entry;
menu_handle_t *menu = (menu_handle_t*)data;
zui_t *zui = (zui_t*)userdata; zui_t *zui = (zui_t*)userdata;
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
@ -1129,7 +1134,7 @@ static int zarch_iterate(void *data, void *userdata, enum menu_action action)
zui->action = action; zui->action = action;
ret = menu_entry_action(&entry, selection, action); ret = menu_entry_action(data, &entry, selection, action);
menu_entry_free(&entry); menu_entry_free(&entry);
if (ret) if (ret)
return -1; return -1;
@ -1156,7 +1161,7 @@ static bool zarch_menu_init_list(void *data)
info.list = selection_buf; info.list = selection_buf;
if (menu_displaylist_ctl(DISPLAYLIST_HISTORY, &info)) if (menu_displaylist_ctl(DISPLAYLIST_HISTORY, &info, data))
{ {
bool ret = false; bool ret = false;
info.need_push = true; info.need_push = true;