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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-12 06:39:29 +00:00
parent abe3e2c39f
commit a6cd2379e2
2 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenPlayerOptions.cpp
+2 -14
View File
@@ -14,9 +14,6 @@
#include "PlayerState.h" #include "PlayerState.h"
#include "Foreach.h" #include "Foreach.h"
#define PREV_SCREEN THEME->GetMetric ("ScreenPlayerOptions","PrevScreen")
#define NEXT_SCREEN THEME->GetMetric ("ScreenPlayerOptions","NextScreen")
REGISTER_SCREEN_CLASS( ScreenPlayerOptions ); REGISTER_SCREEN_CLASS( ScreenPlayerOptions );
ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) : ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
ScreenOptionsMaster( sClassName ) ScreenOptionsMaster( sClassName )
@@ -149,25 +146,16 @@ void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM )
if( SCREENMAN->IsStackedScreen(this) ) if( SCREENMAN->IsStackedScreen(this) )
{ {
SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions ); SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
return;
} }
else
{
SCREENMAN->SetNewScreen( NEXT_SCREEN );
}
return;
} }
else if( SM == SM_GoToPrevScreen ) else if( SM == SM_GoToPrevScreen )
{ {
if( SCREENMAN->IsStackedScreen(this) ) if( SCREENMAN->IsStackedScreen(this) )
{ {
SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions ); SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
return;
} }
else
{
SCREENMAN->DeletePreparedScreens();
SCREENMAN->SetNewScreen( PREV_SCREEN );
}
return;
} }
ScreenOptionsMaster::HandleScreenMessage( SM ); ScreenOptionsMaster::HandleScreenMessage( SM );
stepmania/src/ScreenSongOptions.cpp
+4 -12
View File
@@ -6,9 +6,6 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#define PREV_SCREEN THEME->GetMetric ("ScreenSongOptions","PrevScreen")
#define NEXT_SCREEN THEME->GetMetric ("ScreenSongOptions","NextScreen")
REGISTER_SCREEN_CLASS( ScreenSongOptions ); REGISTER_SCREEN_CLASS( ScreenSongOptions );
ScreenSongOptions::ScreenSongOptions( CString sClassName ) : ScreenSongOptions::ScreenSongOptions( CString sClassName ) :
ScreenOptionsMaster( sClassName ) ScreenOptionsMaster( sClassName )
@@ -44,23 +41,18 @@ void ScreenSongOptions::HandleScreenMessage( const ScreenMessage SM )
if( SM == SM_GoToNextScreen ) if( SM == SM_GoToNextScreen )
{ {
if( SCREENMAN->IsStackedScreen(this) ) if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( SM_BackFromSongOptions ); SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
else return;
SCREENMAN->SetNewScreen( NEXT_SCREEN ); }
return;
} }
else if( SM == SM_GoToPrevScreen ) else if( SM == SM_GoToPrevScreen )
{ {
if( SCREENMAN->IsStackedScreen(this) ) if( SCREENMAN->IsStackedScreen(this) )
{ {
SCREENMAN->PopTopScreen( SM_BackFromSongOptions ); SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
return;
} }
else
{
SCREENMAN->DeletePreparedScreens();
SCREENMAN->SetNewScreen( PREV_SCREEN );
}
return;
} }
ScreenOptionsMaster::HandleScreenMessage( SM ); ScreenOptionsMaster::HandleScreenMessage( SM );