odn't special case Transitions; send them an OnCommand from
BeginScreen, just like everything else
This commit is contained in:
@@ -456,6 +456,7 @@ void ScreenGameplay::Init()
|
|||||||
if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it
|
if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it
|
||||||
{
|
{
|
||||||
m_Toasty.Load( THEME->GetPathB(m_sName,"toasty") );
|
m_Toasty.Load( THEME->GetPathB(m_sName,"toasty") );
|
||||||
|
m_Toasty.PlayCommand("On");
|
||||||
this->AddChild( &m_Toasty );
|
this->AddChild( &m_Toasty );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -487,10 +488,12 @@ void ScreenGameplay::Init()
|
|||||||
|
|
||||||
m_NextSong.Load( THEME->GetPathB(m_sName,"next course song") );
|
m_NextSong.Load( THEME->GetPathB(m_sName,"next course song") );
|
||||||
m_NextSong.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
|
m_NextSong.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
|
||||||
|
m_NextSong.PlayCommand("On");
|
||||||
this->AddChild( &m_NextSong );
|
this->AddChild( &m_NextSong );
|
||||||
|
|
||||||
m_SongFinished.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
|
m_SongFinished.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
|
||||||
m_SongFinished.Load( THEME->GetPathB(m_sName,"song finished") );
|
m_SongFinished.Load( THEME->GetPathB(m_sName,"song finished") );
|
||||||
|
m_SongFinished.PlayCommand("On");
|
||||||
this->AddChild( &m_SongFinished );
|
this->AddChild( &m_SongFinished );
|
||||||
|
|
||||||
|
|
||||||
@@ -694,13 +697,16 @@ void ScreenGameplay::Init()
|
|||||||
if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it
|
if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it
|
||||||
{
|
{
|
||||||
m_Ready.Load( THEME->GetPathB(m_sName,"ready") );
|
m_Ready.Load( THEME->GetPathB(m_sName,"ready") );
|
||||||
|
m_Ready.PlayCommand("On");
|
||||||
this->AddChild( &m_Ready );
|
this->AddChild( &m_Ready );
|
||||||
|
|
||||||
m_Go.Load( THEME->GetPathB(m_sName,"go") );
|
m_Go.Load( THEME->GetPathB(m_sName,"go") );
|
||||||
|
m_Go.PlayCommand("On");
|
||||||
this->AddChild( &m_Go );
|
this->AddChild( &m_Go );
|
||||||
|
|
||||||
m_Failed.Load( THEME->GetPathB(m_sName,"failed") );
|
m_Failed.Load( THEME->GetPathB(m_sName,"failed") );
|
||||||
m_Failed.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); // on top of everything else
|
m_Failed.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); // on top of everything else
|
||||||
|
m_Failed.PlayCommand("On");
|
||||||
this->AddChild( &m_Failed );
|
this->AddChild( &m_Failed );
|
||||||
|
|
||||||
m_textDebug.LoadFromFont( THEME->GetPathF("Common","normal") );
|
m_textDebug.LoadFromFont( THEME->GetPathF("Common","normal") );
|
||||||
|
|||||||
@@ -35,14 +35,17 @@ void ScreenStage::Init()
|
|||||||
m_In.Load( THEME->GetPathB(m_sName,"in") );
|
m_In.Load( THEME->GetPathB(m_sName,"in") );
|
||||||
m_In.StartTransitioning();
|
m_In.StartTransitioning();
|
||||||
m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
|
m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
|
||||||
|
m_In.PlayCommand("On");
|
||||||
this->AddChild( &m_In );
|
this->AddChild( &m_In );
|
||||||
|
|
||||||
m_Out.Load( THEME->GetPathB(m_sName,"out") );
|
m_Out.Load( THEME->GetPathB(m_sName,"out") );
|
||||||
m_Out.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
|
m_Out.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
|
||||||
|
m_Out.PlayCommand("On");
|
||||||
this->AddChild( &m_Out );
|
this->AddChild( &m_Out );
|
||||||
|
|
||||||
m_Cancel.Load( THEME->GetPathB(m_sName,"cancel") );
|
m_Cancel.Load( THEME->GetPathB(m_sName,"cancel") );
|
||||||
m_Cancel.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
|
m_Cancel.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
|
||||||
|
m_Cancel.PlayCommand("On");
|
||||||
this->AddChild( &m_Cancel );
|
this->AddChild( &m_Cancel );
|
||||||
|
|
||||||
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+StageToString(GAMESTATE->GetCurrentStage())) );
|
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+StageToString(GAMESTATE->GetCurrentStage())) );
|
||||||
|
|||||||
@@ -178,6 +178,9 @@ void ScreenWithMenuElements::TweenOnScreen()
|
|||||||
ON_COMMAND( m_textHelp );
|
ON_COMMAND( m_textHelp );
|
||||||
m_sprUnderlay->PlayCommand("On");
|
m_sprUnderlay->PlayCommand("On");
|
||||||
m_sprOverlay->PlayCommand("On");;
|
m_sprOverlay->PlayCommand("On");;
|
||||||
|
m_In.PlayCommand("On");;
|
||||||
|
m_Out.PlayCommand("On");;
|
||||||
|
m_Cancel.PlayCommand("On");;
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenWithMenuElements::~ScreenWithMenuElements()
|
ScreenWithMenuElements::~ScreenWithMenuElements()
|
||||||
|
|||||||
Reference in New Issue
Block a user