mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify input_overlay.c

Browse Source
This commit is contained in:
twinaphex 2015-02-23 06:37:27 +01:00
parent 2390e17fc7
commit 4a7ce3e460
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
input/input_overlay.c
View File

@ -561,38 +561,6 @@ error:
return false; return false;
} }
bool input_overlay_load_overlays_image_iterate(input_overlay_t *ol)
{
bool not_done = true;
if (!ol)
return false;
not_done = ol->pos < ol->size;
if (!not_done)
{
ol->pos = 0;
ol->state = OVERLAY_STATUS_DEFERRED_LOADING_RESOLVE;
return true;
}
if (!input_overlay_load_overlay_image(ol, ol->conf,
ol->overlay_path, &ol->overlays[ol->pos], ol->pos))
{
RARCH_ERR("[Overlay]: Failed to load overlay image #%u.\n", (unsigned)ol->pos);
goto error;
}
ol->state = OVERLAY_STATUS_DEFERRED_LOADING;
return true;
error:
ol->state = OVERLAY_STATUS_DEFERRED_ERROR;
return false;
}
bool input_overlay_load_overlays_iterate(input_overlay_t *ol) bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
{ {
bool not_done = true; bool not_done = true;
@ -663,7 +631,7 @@ bool input_overlay_load_overlays(input_overlay_t *ol)
ol->size = overlays; ol->size = overlays;
ol->pos = 0; ol->pos = 0;
ol->state = OVERLAY_STATUS_DEFERRED_LOADING_IMAGE; ol->state = OVERLAY_STATUS_DEFERRED_LOADING;
return true; return true;

3
runloop.c
View File

@ -885,9 +885,6 @@ void rarch_main_iterate_overlay_state(void)
case OVERLAY_STATUS_DEFERRED_LOAD: case OVERLAY_STATUS_DEFERRED_LOAD:
input_overlay_load_overlays(driver.overlay); input_overlay_load_overlays(driver.overlay);
break; break;
case OVERLAY_STATUS_DEFERRED_LOADING_IMAGE:
input_overlay_load_overlays_image_iterate(driver.overlay);
break;
case OVERLAY_STATUS_DEFERRED_LOADING: case OVERLAY_STATUS_DEFERRED_LOADING:
input_overlay_load_overlays_iterate(driver.overlay); input_overlay_load_overlays_iterate(driver.overlay);
break; break;