This commit is contained in:
twinaphex 2016-02-11 01:54:09 +01:00
parent 14aac016a9
commit 2585145b10
2 changed files with 11 additions and 7 deletions

View File

@ -641,10 +641,10 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
return anim->is_active; return anim->is_active;
case MENU_ANIMATION_CTL_CLEAR_ACTIVE: case MENU_ANIMATION_CTL_CLEAR_ACTIVE:
anim->is_active = false; anim->is_active = false;
return true; break;
case MENU_ANIMATION_CTL_SET_ACTIVE: case MENU_ANIMATION_CTL_SET_ACTIVE:
anim->is_active = true; anim->is_active = true;
return true; break;
case MENU_ANIMATION_CTL_DELTA_TIME: case MENU_ANIMATION_CTL_DELTA_TIME:
{ {
float *ptr = (float*)data; float *ptr = (float*)data;
@ -652,7 +652,7 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
return false; return false;
*ptr = anim->delta_time; *ptr = anim->delta_time;
} }
return true; break;
case MENU_ANIMATION_CTL_UPDATE_TIME: case MENU_ANIMATION_CTL_UPDATE_TIME:
{ {
static retro_time_t last_clock_update = 0; static retro_time_t last_clock_update = 0;
@ -674,7 +674,7 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
last_clock_update = anim->cur_time; last_clock_update = anim->cur_time;
} }
} }
return true; break;
case MENU_ANIMATION_CTL_UPDATE: case MENU_ANIMATION_CTL_UPDATE:
{ {
unsigned i; unsigned i;
@ -696,8 +696,11 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
anim->is_active = true; anim->is_active = true;
} }
return true; break;
default:
case MENU_ANIMATION_CTL_NONE:
break;
} }
return false; return true;
} }

View File

@ -34,7 +34,8 @@ typedef void (*tween_cb) (void);
enum menu_animation_ctl_state enum menu_animation_ctl_state
{ {
MENU_ANIMATION_CTL_IS_ACTIVE = 0, MENU_ANIMATION_CTL_NONE = 0,
MENU_ANIMATION_CTL_IS_ACTIVE,
MENU_ANIMATION_CTL_DEINIT, MENU_ANIMATION_CTL_DEINIT,
MENU_ANIMATION_CTL_CLEAR_ACTIVE, MENU_ANIMATION_CTL_CLEAR_ACTIVE,
MENU_ANIMATION_CTL_SET_ACTIVE, MENU_ANIMATION_CTL_SET_ACTIVE,