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

Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-02-25 13:26:51 +01:00
parent bd0347f1ae
commit f6f306903c
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
menu/menu_animation.c
View File

@ -381,29 +381,10 @@ static void menu_animation_push_internal(menu_animation_t *anim,
*target = *t; *target = *t;
} }
static void menu_animation_free(void)
{
size_t i;
menu_animation_t *anim = menu_animation_get_ptr();
if (!anim)
return;
for (i = 0; i < anim->size; i++)
{
if (anim->list[i].subject)
anim->list[i].subject = NULL;
}
free(anim->list);
memset(anim, 0, sizeof(menu_animation_t));
}
void menu_animation_kill_by_subject(size_t count, const void *subjects) void menu_animation_kill_by_subject(size_t count, const void *subjects)
{ {
unsigned i, j, killed = 0; unsigned i, j, killed = 0;
float **sub = (float**)subjects; float **sub = (float**)subjects;
menu_animation_t *anim = menu_animation_get_ptr(); menu_animation_t *anim = menu_animation_get_ptr();
for (i = 0; i < anim->size; ++i) for (i = 0; i < anim->size; ++i)
@ -413,17 +394,17 @@ void menu_animation_kill_by_subject(size_t count, const void *subjects)
for (j = 0; j < count; ++j) for (j = 0; j < count; ++j)
{ {
if (anim->list[i].subject == sub[j]) if (anim->list[i].subject != sub[j])
{ continue;
anim->list[i].alive = false;
anim->list[i].subject = NULL;
if (i < anim->first_dead) anim->list[i].alive = false;
anim->first_dead = i; anim->list[i].subject = NULL;
killed++; if (i < anim->first_dead)
break; anim->first_dead = i;
}
killed++;
break;
} }
} }
} }
@ -617,7 +598,21 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
switch (state) switch (state)
{ {
case MENU_ANIMATION_CTL_DEINIT: case MENU_ANIMATION_CTL_DEINIT:
menu_animation_free(); {
size_t i;
if (!anim)
return false;
for (i = 0; i < anim->size; i++)
{
if (anim->list[i].subject)
anim->list[i].subject = NULL;
}
free(anim->list);
memset(anim, 0, sizeof(menu_animation_t));
}
break; break;
case MENU_ANIMATION_CTL_IS_ACTIVE: case MENU_ANIMATION_CTL_IS_ACTIVE:
return anim->is_active; return anim->is_active;