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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-14 03:50:19 +00:00
parent 502ca8a26b
commit 561de04706
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenPrompt.cpp
+6 -6
View File
@@ -120,12 +120,12 @@ void ScreenPrompt::HandleScreenMessage( const ScreenMessage SM )
{ {
switch( SM ) switch( SM )
{ {
case SM_DoneOpeningWipingRight: case SM_GoToNextScreen:
if( SCREENMAN->IsStackedScreen(this) ) if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( m_smSendOnPop ); SCREENMAN->PopTopScreen( m_smSendOnPop );
else return;
this->HandleScreenMessage( SM_GoToNextScreen ); }
break;
} }
ScreenWithMenuElements::HandleScreenMessage( SM ); ScreenWithMenuElements::HandleScreenMessage( SM );
@@ -183,12 +183,12 @@ void ScreenPrompt::End( bool bCancelled )
{ {
if( bCancelled ) if( bCancelled )
{ {
m_Cancel.StartTransitioning( SM_DoneOpeningWipingRight ); m_Cancel.StartTransitioning( SM_GoToNextScreen );
} }
else else
{ {
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
m_Out.StartTransitioning( SM_DoneOpeningWipingRight ); m_Out.StartTransitioning( SM_GoToNextScreen );
} }
OFF_COMMAND( m_textQuestion ); OFF_COMMAND( m_textQuestion );
stepmania/src/ScreenTextEntry.cpp
+10 -5
View File
@@ -271,10 +271,15 @@ void ScreenTextEntry::HandleScreenMessage( const ScreenMessage SM )
{ {
switch( SM ) switch( SM )
{ {
case SM_DoneOpeningWipingRight: case SM_GoToNextScreen:
SCREENMAN->PopTopScreen( m_smSendOnPop ); if( SCREENMAN->IsStackedScreen(this) )
break; {
SCREENMAN->PopTopScreen( m_smSendOnPop );
return;
}
} }
Screen::HandleScreenMessage( SM );
} }
void ScreenTextEntry::MoveX( int iDir ) void ScreenTextEntry::MoveX( int iDir )
@@ -388,7 +393,7 @@ void ScreenTextEntry::End( bool bCancelled )
if( m_pOnCancel ) if( m_pOnCancel )
m_pOnCancel(); m_pOnCancel();
m_Cancel.StartTransitioning( SM_DoneOpeningWipingRight ); m_Cancel.StartTransitioning( SM_GoToNextScreen );
} }
else else
{ {
@@ -411,7 +416,7 @@ void ScreenTextEntry::End( bool bCancelled )
m_pOnOK( ret ); m_pOnOK( ret );
} }
m_Out.StartTransitioning( SM_DoneOpeningWipingRight ); m_Out.StartTransitioning( SM_GoToNextScreen );
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
} }