Cosmetic fix: Removed display of "Lets Move On" graphic (KeepAliveTransition) when transitioning from the evaluation screen of the last song played to the summary evaluation screen.
This commit is contained in:
@@ -864,7 +864,11 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn )
|
|||||||
if( m_bTryExtraStage )
|
if( m_bTryExtraStage )
|
||||||
m_Menu.TweenOffScreenToMenu( SM_GoToSelectMusic );
|
m_Menu.TweenOffScreenToMenu( SM_GoToSelectMusic );
|
||||||
else if( m_ResultMode == RM_ARCADE_STAGE && GAMESTATE->m_iCurrentStageIndex == PREFSMAN->m_iNumArcadeStages-1 )
|
else if( m_ResultMode == RM_ARCADE_STAGE && GAMESTATE->m_iCurrentStageIndex == PREFSMAN->m_iNumArcadeStages-1 )
|
||||||
|
{
|
||||||
|
//Disable "Lets Move On Graphic"
|
||||||
|
m_Menu.m_KeepAlive.SetHidden();
|
||||||
m_Menu.TweenOffScreenToMenu( SM_GoToFinalEvaluation );
|
m_Menu.TweenOffScreenToMenu( SM_GoToFinalEvaluation );
|
||||||
|
}
|
||||||
else if( m_ResultMode == RM_ARCADE_STAGE && GAMESTATE->m_iCurrentStageIndex < PREFSMAN->m_iNumArcadeStages-1 )
|
else if( m_ResultMode == RM_ARCADE_STAGE && GAMESTATE->m_iCurrentStageIndex < PREFSMAN->m_iNumArcadeStages-1 )
|
||||||
m_Menu.TweenOffScreenToMenu( SM_GoToSelectMusic );
|
m_Menu.TweenOffScreenToMenu( SM_GoToSelectMusic );
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
#include "RageMusic.h"
|
#include "RageMusic.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
|
#include "RageLog.h"
|
||||||
|
|
||||||
#define STOP_MUSIC_ON_NEXT THEME->GetMetricB("TransitionKeepAlive","StopMusicOnNext")
|
#define STOP_MUSIC_ON_NEXT THEME->GetMetricB("TransitionKeepAlive","StopMusicOnNext")
|
||||||
#define KEEP_ALIVE_TYPE THEME->GetMetricI("TransitionKeepAlive","KeepAliveType")
|
#define KEEP_ALIVE_TYPE THEME->GetMetricI("TransitionKeepAlive","KeepAliveType")
|
||||||
@@ -25,6 +25,7 @@ enum KeepAliveType // for use with the metric above
|
|||||||
{
|
{
|
||||||
KEEP_ALIVE_TYPE_MAX = 0,
|
KEEP_ALIVE_TYPE_MAX = 0,
|
||||||
KEEP_ALIVE_TYPE_5TH,
|
KEEP_ALIVE_TYPE_5TH,
|
||||||
|
KEEP_ALIVE_TYPE_HIDDEN, //disable drawing of the keep alive transition (for transitioning to the summary score screen)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -43,6 +44,11 @@ TransitionKeepAlive::TransitionKeepAlive()
|
|||||||
m_sprLogo.SetXY( CENTER_X, CENTER_Y );
|
m_sprLogo.SetXY( CENTER_X, CENTER_Y );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TransitionKeepAlive::SetHidden()
|
||||||
|
{
|
||||||
|
g_KeepAliveType = (KeepAliveType)KEEP_ALIVE_TYPE_HIDDEN;
|
||||||
|
}
|
||||||
|
|
||||||
void TransitionKeepAlive::Update( float fDeltaTime )
|
void TransitionKeepAlive::Update( float fDeltaTime )
|
||||||
{
|
{
|
||||||
// hack: Smooth out the big hickups.
|
// hack: Smooth out the big hickups.
|
||||||
@@ -57,6 +63,8 @@ void TransitionKeepAlive::DrawPrimitives()
|
|||||||
// draw keep alive graphic
|
// draw keep alive graphic
|
||||||
switch( g_KeepAliveType )
|
switch( g_KeepAliveType )
|
||||||
{
|
{
|
||||||
|
case KEEP_ALIVE_TYPE_HIDDEN: //draw nothing
|
||||||
|
break; //for last transition (to final score summary screen)
|
||||||
case KEEP_ALIVE_TYPE_MAX:
|
case KEEP_ALIVE_TYPE_MAX:
|
||||||
{
|
{
|
||||||
float fPercentClosed = 1 - this->GetPercentageOpen();
|
float fPercentClosed = 1 - this->GetPercentageOpen();
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ public:
|
|||||||
virtual void OpenWipingLeft( ScreenMessage send_when_done = SM_None );
|
virtual void OpenWipingLeft( ScreenMessage send_when_done = SM_None );
|
||||||
virtual void CloseWipingRight(ScreenMessage send_when_done = SM_None );
|
virtual void CloseWipingRight(ScreenMessage send_when_done = SM_None );
|
||||||
virtual void CloseWipingLeft( ScreenMessage send_when_done = SM_None );
|
virtual void CloseWipingLeft( ScreenMessage send_when_done = SM_None );
|
||||||
|
virtual void SetHidden();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Sprite m_sprLogo;
|
Sprite m_sprLogo;
|
||||||
|
|||||||
Reference in New Issue
Block a user