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

fix weird botched merge

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-14 23:11:57 +00:00
parent 77fb974798
commit 4a7eb41b83
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+6 -6
View File
@@ -125,9 +125,9 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
SET_XY( m_BPMDisplay ); SET_XY( m_BPMDisplay );
this->AddChild( &m_BPMDisplay ); this->AddChild( &m_BPMDisplay );
m_DifficultyMeter[p].SetName( "DifficultyMeter", ssprintf("MeterP%d",p+1) ); m_DifficultyDisplay.SetName( "DifficultyDisplay" );
m_DifficultyMeter[p].Load(); m_DifficultyDisplay.EnableShadow( false );
SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] ); SET_XY( m_DifficultyDisplay );
this->AddChild( &m_DifficultyDisplay ); this->AddChild( &m_DifficultyDisplay );
{ {
@@ -213,9 +213,9 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
SET_XY( m_sprMeterFrame[p] ); SET_XY( m_sprMeterFrame[p] );
this->AddChild( &m_sprMeterFrame[p] ); this->AddChild( &m_sprMeterFrame[p] );
m_DifficultyMeter[p].SetName( ssprintf("MeterP%d",p+1) ); m_DifficultyMeter[p].SetName( "DifficultyMeter", ssprintf("MeterP%d",p+1) );
m_DifficultyMeter[p].SetShadowLength( 2 ); m_DifficultyMeter[p].Load();
SET_XY( m_DifficultyMeter[p] ); SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] );
this->AddChild( &m_DifficultyMeter[p] ); this->AddChild( &m_DifficultyMeter[p] );
m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) ); m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) );