actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename back -> cancel because "back" conflicts with "background"

Browse Source
This commit is contained in:
Chris Danford
2005-03-20 06:14:41 +00:00
parent 1ab61d7dde
commit 48e6cb1a69
27 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenStage.cpp
+6 -6
View File
@@ -52,9 +52,9 @@ void ScreenStage::Init()
m_Out.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
this->AddChild( &m_Out );
m_Back.Load( THEME->GetPathB("Common","back") );
m_Back.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
this->AddChild( &m_Back );
m_Cancel.Load( THEME->GetPathB(m_sName,"cancel") );
m_Cancel.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
this->AddChild( &m_Cancel );
/* Prep the new screen once m_In is complete. */
this->PostScreenMessage( SM_PrepScreen, m_Overlay->GetTweenTimeLeft() );
@@ -147,15 +147,15 @@ void ScreenStage::Update( float fDeltaTime )
void ScreenStage::MenuBack( PlayerNumber pn )
{
if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Back.IsTransitioning() )
if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Cancel.IsTransitioning() )
return;
if( !ALLOW_BACK )
return;
this->ClearMessageQueue();
m_Back.StartTransitioning( SM_GoToPrevScreen );
SOUND->PlayOnce( THEME->GetPathS("Common","back") );
m_Cancel.StartTransitioning( SM_GoToPrevScreen );
SCREENMAN->PlayCancelSound();
/* If a Back is buffered while we're prepping the screen (very common), we'll
* get it right after the prep finishes. However, the next update will contain