From 52f915d0f8dc13b753171725d84fc45438fb9eff Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jun 2003 07:10:03 +0000 Subject: [PATCH] add DifficultyDisplay --- stepmania/src/ScreenSelectMusic.cpp | 8 ++++++++ stepmania/src/ScreenSelectMusic.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 6ed2a6c9c1..2f2f449015 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -104,6 +104,10 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic") m_BPMDisplay.SetName( "BPM" ); this->AddChild( &m_BPMDisplay ); + m_DifficultyDisplay.SetName( "DifficultyDisplay" ); + m_DifficultyDisplay.EnableShadow( false ); + this->AddChild( &m_DifficultyDisplay ); + m_sprStage.SetName( "Stage" ); m_sprStage.Load( THEME->GetPathToG("ScreenSelectMusic stage "+GAMESTATE->GetStageText()) ); this->AddChild( &m_sprStage ); @@ -241,6 +245,7 @@ void ScreenSelectMusic::TweenOnScreen() SET_XY_AND_ON_COMMAND( m_Banner ); SET_XY_AND_ON_COMMAND( m_sprBannerFrame ); SET_XY_AND_ON_COMMAND( m_BPMDisplay ); + SET_XY_AND_ON_COMMAND( m_DifficultyDisplay ); SET_XY_AND_ON_COMMAND( m_sprStage ); SET_XY_AND_ON_COMMAND( m_sprCDTitleFront ); SET_XY_AND_ON_COMMAND( m_sprCDTitleBack ); @@ -278,6 +283,7 @@ void ScreenSelectMusic::TweenOffScreen() OFF_COMMAND( m_Banner ); OFF_COMMAND( m_sprBannerFrame ); OFF_COMMAND( m_BPMDisplay ); + OFF_COMMAND( m_DifficultyDisplay ); OFF_COMMAND( m_sprStage ); OFF_COMMAND( m_sprCDTitleFront ); OFF_COMMAND( m_sprCDTitleBack ); @@ -835,6 +841,8 @@ void ScreenSelectMusic::AfterMusicChange() m_sprCDTitleBack.Load( CDTitlePath ); FlipSpriteHorizontally(m_sprCDTitleBack); + m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); + for( int p=0; pIsHumanPlayer( PlayerNumber(p) ) ) diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 1f96ae3774..8d5da69565 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -23,6 +23,7 @@ #include "DifficultyIcon.h" #include "DifficultyMeter.h" #include "OptionIconRow.h" +#include "DifficultyDisplay.h" class ScreenSelectMusic : public Screen @@ -80,6 +81,7 @@ protected: BitmapText m_textHighScore[NUM_PLAYERS]; MusicWheel m_MusicWheel; Sprite m_sprBalloon; + DifficultyDisplay m_DifficultyDisplay; bool m_bMadeChoice; bool m_bGoToOptions;