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

move screen flow logic into branches, not PlayMode specific metrics

Browse Source
This commit is contained in:
Chris Danford
2004-04-18 05:15:22 +00:00
parent ec0258a73b
commit dfba0c0c46
7 changed files with 72 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenPlayerOptions.cpp
+4 -4
View File
@@ -20,8 +20,8 @@
#include "CodeDetector.h"
#define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenPlayerOptions","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
#define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenPlayerOptions","NextScreen"+Capitalize(PlayModeToString(play_mode)))
#define PREV_SCREEN THEME->GetMetric ("ScreenPlayerOptions","PrevScreen")
#define NEXT_SCREEN THEME->GetMetric ("ScreenPlayerOptions","NextScreen")
ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
ScreenOptionsMaster( sClassName )
@@ -68,7 +68,7 @@ void ScreenPlayerOptions::GoToPrevState()
if( GAMESTATE->m_bEditing )
SCREENMAN->PopTopScreen();
else
SCREENMAN->SetNewScreen( PREV_SCREEN(GAMESTATE->m_PlayMode) );
SCREENMAN->SetNewScreen( PREV_SCREEN );
}
void ScreenPlayerOptions::GoToNextState()
@@ -80,7 +80,7 @@ void ScreenPlayerOptions::GoToNextState()
GAMESTATE->AdjustFailType();
if( m_bGoToOptions )
SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) );
SCREENMAN->SetNewScreen( NEXT_SCREEN );
else
SCREENMAN->SetNewScreen( ScreenSongOptions::GetNextScreen() );
}