use PaneDisplay

This commit is contained in:
Glenn Maynard
2003-11-17 06:13:12 +00:00
parent b4f56c01ed
commit 60576e4492
2 changed files with 16 additions and 0 deletions
+14
View File
@@ -50,6 +50,7 @@ const int NUM_SCORE_DIGITS = 9;
#define SAMPLE_MUSIC_DELAY THEME->GetMetricF("ScreenSelectMusic","SampleMusicDelay")
#define SHOW_RADAR THEME->GetMetricB("ScreenSelectMusic","ShowRadar")
#define SHOW_GRAPH THEME->GetMetricB("ScreenSelectMusic","ShowGraph")
#define SHOW_PANES THEME->GetMetricB("ScreenSelectMusic","ShowPanes")
#define SHOW_DIFFICULTY_LIST THEME->GetMetricB("ScreenSelectMusic","ShowDifficultyList")
#define CDTITLE_SPIN_SECONDS THEME->GetMetricF("ScreenSelectMusic","CDTitleSpinSeconds")
#define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
@@ -241,6 +242,13 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
this->AddChild( &m_DifficultyList );
}
if( SHOW_PANES )
{
m_PaneDisplay[p].SetName( "PaneDisplay", ssprintf("PaneDisplayP%d",p+1) );
m_PaneDisplay[p].Load( (PlayerNumber) p );
this->AddChild( &m_PaneDisplay[p] );
}
m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) );
m_sprHighScoreFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic score frame p%d",p+1)) );
SET_XY( m_sprHighScoreFrame[p] );
@@ -452,6 +460,8 @@ void ScreenSelectMusic::TweenOnScreen()
ON_COMMAND( m_OptionIconRow[p] );
ON_COMMAND( m_sprHighScoreFrame[p] );
ON_COMMAND( m_textHighScore[p] );
if( SHOW_PANES )
ON_COMMAND( m_PaneDisplay[p] );
}
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
@@ -499,6 +509,8 @@ void ScreenSelectMusic::TweenOffScreen()
OFF_COMMAND( m_OptionIconRow[p] );
OFF_COMMAND( m_sprHighScoreFrame[p] );
OFF_COMMAND( m_textHighScore[p] );
if( SHOW_PANES )
OFF_COMMAND( m_PaneDisplay[p] );
}
}
@@ -986,6 +998,8 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn )
m_DifficultyList.SetFromGameState();
m_GrooveRadar.SetFromNotes( pn, pNotes );
m_MusicWheel.NotesChanged( pn );
if( SHOW_PANES )
m_PaneDisplay[pn].SetFromGameState();
}
void ScreenSelectMusic::SwitchToPreferredDifficulty()