add DifficultyList

This commit is contained in:
Glenn Maynard
2003-11-17 04:29:14 +00:00
parent df46483680
commit 3253e066a4
2 changed files with 15 additions and 0 deletions
+13
View File
@@ -50,6 +50,7 @@ const int NUM_SCORE_DIGITS = 9;
#define SAMPLE_MUSIC_DELAY THEME->GetMetricF("ScreenSelectMusic","SampleMusicDelay") #define SAMPLE_MUSIC_DELAY THEME->GetMetricF("ScreenSelectMusic","SampleMusicDelay")
#define SHOW_RADAR THEME->GetMetricB("ScreenSelectMusic","ShowRadar") #define SHOW_RADAR THEME->GetMetricB("ScreenSelectMusic","ShowRadar")
#define SHOW_GRAPH THEME->GetMetricB("ScreenSelectMusic","ShowGraph") #define SHOW_GRAPH THEME->GetMetricB("ScreenSelectMusic","ShowGraph")
#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( play_mode ) THEME->GetMetric ("ScreenSelectMusic","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
#define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","NextScreen"+Capitalize(PlayModeToString(play_mode))) #define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","NextScreen"+Capitalize(PlayModeToString(play_mode)))
@@ -232,6 +233,14 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] ); SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] );
this->AddChild( &m_DifficultyMeter[p] ); this->AddChild( &m_DifficultyMeter[p] );
if( SHOW_DIFFICULTY_LIST )
{
m_DifficultyList.SetName( "DifficultyList" );
m_DifficultyList.Load();
SET_XY_AND_ON_COMMAND( m_DifficultyList );
this->AddChild( &m_DifficultyList );
}
m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) ); m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) );
m_sprHighScoreFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic score frame p%d",p+1)) ); m_sprHighScoreFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic score frame p%d",p+1)) );
SET_XY( m_sprHighScoreFrame[p] ); SET_XY( m_sprHighScoreFrame[p] );
@@ -357,6 +366,8 @@ void ScreenSelectMusic::SkipSongPartTweens()
{ {
m_GrooveRadar.FinishTweening(); m_GrooveRadar.FinishTweening();
m_GrooveGraph.FinishTweening(); m_GrooveGraph.FinishTweening();
if( SHOW_DIFFICULTY_LIST )
m_DifficultyList.FinishTweening();
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
{ {
@@ -951,6 +962,8 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn )
m_AutoGenIcon[pn].SetDiffuse( RageColor(1,1,1,0) ); m_AutoGenIcon[pn].SetDiffuse( RageColor(1,1,1,0) );
} }
m_DifficultyMeter[pn].SetFromGameState( pn ); m_DifficultyMeter[pn].SetFromGameState( pn );
if( SHOW_DIFFICULTY_LIST )
m_DifficultyList.SetFromGameState();
m_GrooveRadar.SetFromNotes( pn, pNotes ); m_GrooveRadar.SetFromNotes( pn, pNotes );
m_MusicWheel.NotesChanged( pn ); m_MusicWheel.NotesChanged( pn );
} }
+2
View File
@@ -24,6 +24,7 @@
#include "DifficultyMeter.h" #include "DifficultyMeter.h"
#include "OptionIconRow.h" #include "OptionIconRow.h"
#include "DifficultyDisplay.h" #include "DifficultyDisplay.h"
#include "DifficultyList.h"
#include "CourseContentsList.h" #include "CourseContentsList.h"
#include "HelpDisplay.h" #include "HelpDisplay.h"
@@ -93,6 +94,7 @@ protected:
MusicWheel m_MusicWheel; MusicWheel m_MusicWheel;
Sprite m_sprBalloon; Sprite m_sprBalloon;
DifficultyDisplay m_DifficultyDisplay; DifficultyDisplay m_DifficultyDisplay;
DifficultyList m_DifficultyList;
CourseContentsList m_CourseContentsFrame; CourseContentsList m_CourseContentsFrame;
HelpDisplay m_Artist; HelpDisplay m_Artist;
BitmapText m_MachineRank; BitmapText m_MachineRank;