funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-03-18 18:02:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed menu tween precidence

Browse Source
This commit is contained in:
Don Honerbrink
2015-02-03 16:29:05 -06:00
parent be1cd8165c
commit ad0abe779e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RetroFE/Source/Graphics/Component/Component.cpp
View File

@@ -201,6 +201,12 @@ void Component::Update(float dt)
EnterRequested = false; EnterRequested = false;
NewItemSelected = false; NewItemSelected = false;
} }
else if(MenuExitRequested)
{
MenuExitRequested = false;
CurrentTweens = Tweens->GetTween("menuExit", MenuExitIndex);
CurrentAnimationState = MENU_EXIT;
}
else if(MenuEnterRequested) else if(MenuEnterRequested)
{ {
MenuEnterRequested = false; MenuEnterRequested = false;
@@ -213,12 +219,6 @@ void Component::Update(float dt)
CurrentTweens = Tweens->GetTween("menuScroll", MenuEnterIndex); CurrentTweens = Tweens->GetTween("menuScroll", MenuEnterIndex);
CurrentAnimationState = MENU_SCROLL; CurrentAnimationState = MENU_SCROLL;
} }
else if(MenuExitRequested)
{
MenuExitRequested = false;
CurrentTweens = Tweens->GetTween("menuExit", MenuExitIndex);
CurrentAnimationState = MENU_EXIT;
}
else if(IsScrollActive() || NewItemSelected || ExitRequested) else if(IsScrollActive() || NewItemSelected || ExitRequested)
{ {
CurrentTweens = Tweens->GetTween("highlightExit", MenuEnterIndex); CurrentTweens = Tweens->GetTween("highlightExit", MenuEnterIndex);