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/ScreenSongOptions.cpp
+5 -5
View File
@@ -15,13 +15,13 @@
#include "ThemeManager.h"
#include "PrefsManager.h"
#define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenSongOptions","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
#define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenSongOptions","NextScreen"+Capitalize(PlayModeToString(play_mode)))
#define PREV_SCREEN THEME->GetMetric ("ScreenSongOptions","PrevScreen")
#define NEXT_SCREEN THEME->GetMetric ("ScreenSongOptions","NextScreen")
/* Get the next screen we'll go to when finished. */
CString ScreenSongOptions::GetNextScreen()
{
return NEXT_SCREEN(GAMESTATE->m_PlayMode);
return NEXT_SCREEN;
}
@@ -42,7 +42,7 @@ void ScreenSongOptions::GoToPrevState()
if( GAMESTATE->m_bEditing )
SCREENMAN->PopTopScreen( SM_None );
else
SCREENMAN->SetNewScreen( PREV_SCREEN(GAMESTATE->m_PlayMode) );
SCREENMAN->SetNewScreen( PREV_SCREEN );
}
void ScreenSongOptions::GoToNextState()
@@ -50,5 +50,5 @@ void ScreenSongOptions::GoToNextState()
if( GAMESTATE->m_bEditing )
SCREENMAN->PopTopScreen();
else
SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) );
SCREENMAN->SetNewScreen( NEXT_SCREEN );
}