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

simplify branching metrics for ScreenSelectMusic

Browse Source
This commit is contained in:
Chris Danford
2004-04-18 03:45:25 +00:00
parent 854252d7ce
commit ec0258a73b
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+11 -18
View File
@@ -747,27 +747,20 @@ TimerSeconds=60
StyleIcon=1 StyleIcon=1
MemoryCardIcons=1 MemoryCardIcons=1
SampleMusicDelay=0.25 SampleMusicDelay=0.25
PrevScreenArcade=ScreenTitleMenu PrevScreen=ScreenTitleMenu
PrevScreenNonstop=ScreenTitleMenu NextScreen=ScreenStage
PrevScreenOni=ScreenTitleMenu NextOptionsScreen=ScreenBranchOptions
PrevScreenEndless=ScreenTitleMenu
PrevScreenBattle=ScreenTitleMenu
PrevScreenRave=ScreenTitleMenu
NextScreenArcade=ScreenStage
NextScreenNonstop=ScreenStage
NextScreenOni=ScreenStage
NextScreenEndless=ScreenStage
NextScreenBattle=ScreenStage
NextScreenRave=ScreenStage
NextOptionsScreenArcade=ScreenPlayerOptions
NextOptionsScreenNonstop=ScreenPlayerOptions
NextOptionsScreenOni=ScreenPlayerOptions
NextOptionsScreenEndless=ScreenPlayerOptions
NextOptionsScreenBattle=ScreenPlayerOptions
NextOptionsScreenRave=ScreenRaveOptions
DoRouletteOnMenuTimer=1 DoRouletteOnMenuTimer=1
AlignMusicBeat=0 AlignMusicBeat=0
[ScreenBranchOptions]
Class=ScreenBranch
Choices=Rave,Normal
ConditionRave=PlayModeName() == "rave"
ConditionNormal=true
NextScreenRave=screen,ScreenRaveOptions
NextScreenNormal=screen,ScreenPlayerOptions
[ScreenEz2SelectMusic] [ScreenEz2SelectMusic]
UseModeSwitcher=0 UseModeSwitcher=0
BalloonX=492 BalloonX=492
stepmania/src/GameState.cpp
+1
View File
@@ -1558,6 +1558,7 @@ LuaFunction_NoArgs( IsExtraStage, GAMESTATE->IsExtraStage() )
LuaFunction_NoArgs( IsExtraStage2, GAMESTATE->IsExtraStage2() ) LuaFunction_NoArgs( IsExtraStage2, GAMESTATE->IsExtraStage2() )
LuaFunction_NoArgs( CourseSongIndex, GAMESTATE->GetCourseSongIndex() ) LuaFunction_NoArgs( CourseSongIndex, GAMESTATE->GetCourseSongIndex() )
LuaFunction_NoArgs( CurStyle, GAMESTATE->m_CurStyle ) LuaFunction_NoArgs( CurStyle, GAMESTATE->m_CurStyle )
LuaFunction_NoArgs( PlayModeName, PlayModeToString(GAMESTATE->m_PlayMode) )
LuaFunction_NoArgs( CurStyleName, CString( GAMESTATE->m_CurStyle == STYLE_INVALID? "none": GAMESTATE->GetCurrentStyleDef()->m_szName ) ) LuaFunction_NoArgs( CurStyleName, CString( GAMESTATE->m_CurStyle == STYLE_INVALID? "none": GAMESTATE->GetCurrentStyleDef()->m_szName ) )
LuaFunction_NoArgs( GetNumPlayersEnabled, GAMESTATE->GetNumPlayersEnabled() ) LuaFunction_NoArgs( GetNumPlayersEnabled, GAMESTATE->GetNumPlayersEnabled() )
LuaFunction_NoArgs( PlayerUsingBothSides, GAMESTATE->PlayerUsingBothSides() ) LuaFunction_NoArgs( PlayerUsingBothSides, GAMESTATE->PlayerUsingBothSides() )
stepmania/src/ScreenSelectMusic.cpp
+6 -6
View File
@@ -52,9 +52,9 @@ const int NUM_SCORE_DIGITS = 9;
#define SHOW_PANES THEME->GetMetricB("ScreenSelectMusic","ShowPanes") #define SHOW_PANES THEME->GetMetricB("ScreenSelectMusic","ShowPanes")
#define SHOW_DIFFICULTY_LIST THEME->GetMetricB("ScreenSelectMusic","ShowDifficultyList") #define SHOW_DIFFICULTY_LIST THEME->GetMetricB("ScreenSelectMusic","ShowDifficultyList")
#define CDTITLE_SPIN_SECONDS THEME->GetMetricF("ScreenSelectMusic","CDTitleSpinSeconds") #define CDTITLE_SPIN_SECONDS THEME->GetMetricF("ScreenSelectMusic","CDTitleSpinSeconds")
#define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","PrevScreen"+Capitalize(PlayModeToString(play_mode))) #define PREV_SCREEN THEME->GetMetric ("ScreenSelectMusic","PrevScreen")
#define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","NextScreen"+Capitalize(PlayModeToString(play_mode))) #define NEXT_SCREEN THEME->GetMetric ("ScreenSelectMusic","NextScreen")
#define NEXT_OPTIONS_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","NextOptionsScreen"+Capitalize(PlayModeToString(play_mode))) #define NEXT_OPTIONS_SCREEN THEME->GetMetric ("ScreenSelectMusic","NextOptionsScreen")
#define SCORE_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreP%iSortChangeCommand", i+1)) #define SCORE_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreP%iSortChangeCommand", i+1))
#define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreFrameP%iSortChangeCommand", i+1)) #define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreFrameP%iSortChangeCommand", i+1))
#define DO_ROULETTE_ON_MENU_TIMER THEME->GetMetricB("ScreenSelectMusic","DoRouletteOnMenuTimer") #define DO_ROULETTE_ON_MENU_TIMER THEME->GetMetricB("ScreenSelectMusic","DoRouletteOnMenuTimer")
@@ -987,7 +987,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
} }
break; break;
case SM_GoToPrevScreen: case SM_GoToPrevScreen:
SCREENMAN->SetNewScreen( PREV_SCREEN(GAMESTATE->m_PlayMode) ); SCREENMAN->SetNewScreen( PREV_SCREEN );
/* We may have stray SM_SongChanged messages from the music wheel. We can't /* We may have stray SM_SongChanged messages from the music wheel. We can't
* handle them anymore, since the title menu (and attract screens) reset * handle them anymore, since the title menu (and attract screens) reset
* the game state, so just discard them. */ * the game state, so just discard them. */
@@ -1003,13 +1003,13 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
case SM_GoToNextScreen: case SM_GoToNextScreen:
if( m_bGoToOptions ) if( m_bGoToOptions )
{ {
SCREENMAN->SetNewScreen( NEXT_OPTIONS_SCREEN(GAMESTATE->m_PlayMode) ); SCREENMAN->SetNewScreen( NEXT_OPTIONS_SCREEN );
} }
else else
{ {
GAMESTATE->AdjustFailType(); GAMESTATE->AdjustFailType();
SOUND->StopMusic(); SOUND->StopMusic();
SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) ); SCREENMAN->SetNewScreen( NEXT_SCREEN );
} }
break; break;
case SM_SongChanged: case SM_SongChanged: