(er, DifficultyDisplay)
This commit is contained in:
@@ -120,11 +120,6 @@ void ScreenSelectMusic::Init()
|
|||||||
SET_XY( m_Banner );
|
SET_XY( m_Banner );
|
||||||
this->AddChild( &m_Banner );
|
this->AddChild( &m_Banner );
|
||||||
|
|
||||||
m_DifficultyDisplay.SetName( "DifficultyDisplay" );
|
|
||||||
m_DifficultyDisplay.SetShadowLength( 0 );
|
|
||||||
SET_XY( m_DifficultyDisplay );
|
|
||||||
this->AddChild( &m_DifficultyDisplay );
|
|
||||||
|
|
||||||
m_sprCDTitleFront.SetName( "CDTitle" );
|
m_sprCDTitleFront.SetName( "CDTitle" );
|
||||||
m_sprCDTitleFront.Load( THEME->GetPathG(m_sName,"fallback cdtitle") );
|
m_sprCDTitleFront.Load( THEME->GetPathG(m_sName,"fallback cdtitle") );
|
||||||
SET_XY( m_sprCDTitleFront );
|
SET_XY( m_sprCDTitleFront );
|
||||||
@@ -942,7 +937,6 @@ void ScreenSelectMusic::AfterMusicChange()
|
|||||||
m_iSelection[p] = -1;
|
m_iSelection[p] = -1;
|
||||||
|
|
||||||
g_sCDTitlePath = ""; // none
|
g_sCDTitlePath = ""; // none
|
||||||
m_DifficultyDisplay.UnsetDifficulties();
|
|
||||||
|
|
||||||
m_fSampleStartSeconds = 0;
|
m_fSampleStartSeconds = 0;
|
||||||
m_fSampleLengthSeconds = -1;
|
m_fSampleLengthSeconds = -1;
|
||||||
@@ -993,8 +987,6 @@ void ScreenSelectMusic::AfterMusicChange()
|
|||||||
g_sCDTitlePath = pSong->GetCDTitlePath();
|
g_sCDTitlePath = pSong->GetCDTitlePath();
|
||||||
g_bWantFallbackCdTitle = true;
|
g_bWantFallbackCdTitle = true;
|
||||||
|
|
||||||
m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType );
|
|
||||||
|
|
||||||
SwitchToPreferredDifficulty();
|
SwitchToPreferredDifficulty();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -1021,8 +1013,6 @@ void ScreenSelectMusic::AfterMusicChange()
|
|||||||
if( g_sBannerPath.empty() )
|
if( g_sBannerPath.empty() )
|
||||||
m_Banner.LoadFallback();
|
m_Banner.LoadFallback();
|
||||||
|
|
||||||
m_DifficultyDisplay.UnsetDifficulties();
|
|
||||||
|
|
||||||
SwitchToPreferredDifficulty();
|
SwitchToPreferredDifficulty();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include "MusicWheel.h"
|
#include "MusicWheel.h"
|
||||||
#include "Banner.h"
|
#include "Banner.h"
|
||||||
#include "FadingBanner.h"
|
#include "FadingBanner.h"
|
||||||
#include "DifficultyDisplay.h"
|
|
||||||
#include "RageUtil_BackgroundLoader.h"
|
#include "RageUtil_BackgroundLoader.h"
|
||||||
#include "ThemeMetric.h"
|
#include "ThemeMetric.h"
|
||||||
#include "ActorCommands.h"
|
#include "ActorCommands.h"
|
||||||
@@ -81,7 +80,6 @@ protected:
|
|||||||
Sprite m_sprHighScoreFrame[NUM_PLAYERS];
|
Sprite m_sprHighScoreFrame[NUM_PLAYERS];
|
||||||
BitmapText m_textHighScore[NUM_PLAYERS];
|
BitmapText m_textHighScore[NUM_PLAYERS];
|
||||||
MusicWheel m_MusicWheel;
|
MusicWheel m_MusicWheel;
|
||||||
DifficultyDisplay m_DifficultyDisplay;
|
|
||||||
|
|
||||||
bool m_bMadeChoice;
|
bool m_bMadeChoice;
|
||||||
bool m_bGoToOptions;
|
bool m_bGoToOptions;
|
||||||
|
|||||||
Reference in New Issue
Block a user