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

long/marathon in xml

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-17 00:32:00 +00:00
parent 7bed654fbb
commit ba7d8d2849
2 changed files with 2 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+2 -45
View File
@@ -167,16 +167,6 @@ void ScreenSelectMusic::Init()
this->AddChild( &m_textHighScore[p] ); this->AddChild( &m_textHighScore[p] );
} }
m_sprLongBalloon.Load( THEME->GetPathG(m_sName,"balloon long") );
m_sprLongBalloon->SetName( "Balloon" );
m_sprLongBalloon->SetHidden( 1 );
this->AddChild( m_sprLongBalloon );
m_sprMarathonBalloon.Load( THEME->GetPathG(m_sName,"balloon marathon") );
m_sprMarathonBalloon->SetName( "Balloon" );
m_sprMarathonBalloon->SetHidden( 1 );
this->AddChild( m_sprMarathonBalloon );
m_soundDifficultyEasier.Load( THEME->GetPathS(m_sName,"difficulty easier") ); m_soundDifficultyEasier.Load( THEME->GetPathS(m_sName,"difficulty easier") );
m_soundDifficultyHarder.Load( THEME->GetPathS(m_sName,"difficulty harder") ); m_soundDifficultyHarder.Load( THEME->GetPathS(m_sName,"difficulty harder") );
m_soundOptionsChange.Load( THEME->GetPathS(m_sName,"options") ); m_soundOptionsChange.Load( THEME->GetPathS(m_sName,"options") );
@@ -915,7 +905,7 @@ void ScreenSelectMusic::AfterStepsChange( const vector<PlayerNumber> &vpns )
int iScore = 0; int iScore = 0;
if( pSteps ) if( pSteps )
{ {
Profile* pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile(); const Profile *pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile();
iScore = pProfile->GetStepsHighScoreList(pSong,pSteps).GetTopScore().GetScore(); iScore = pProfile->GetStepsHighScoreList(pSong,pSteps).GetTopScore().GetScore();
} }
@@ -941,7 +931,7 @@ void ScreenSelectMusic::AfterTrailChange( const vector<PlayerNumber> &vpns )
int iScore = 0; int iScore = 0;
if( pTrail ) if( pTrail )
{ {
Profile* pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile(); const Profile *pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile();
iScore = pProfile->GetCourseHighScoreList(pCourse,pTrail).GetTopScore().GetScore(); iScore = pProfile->GetCourseHighScoreList(pCourse,pTrail).GetTopScore().GetScore();
} }
@@ -1121,9 +1111,6 @@ void ScreenSelectMusic::AfterMusicChange()
default: default:
ASSERT(0); ASSERT(0);
} }
COMMAND( m_sprLongBalloon, "Hide" );
COMMAND( m_sprMarathonBalloon, "Hide" );
} }
break; break;
case TYPE_SONG: case TYPE_SONG:
@@ -1155,28 +1142,6 @@ void ScreenSelectMusic::AfterMusicChange()
m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType ); m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType );
SwitchToPreferredDifficulty(); SwitchToPreferredDifficulty();
/* Short delay before actually showing these, so they don't show
* up when scrolling fast. It'll still show up in "slow" scrolling,
* but it doesn't look at weird as it does in "fast", and I don't
* like the effect with a lot of delay. */
if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds )
{
SET_XY( m_sprMarathonBalloon );
COMMAND( m_sprMarathonBalloon, "Show" );
COMMAND( m_sprLongBalloon, "Hide" );
}
else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds )
{
SET_XY( m_sprLongBalloon );
COMMAND( m_sprLongBalloon, "Show" );
COMMAND( m_sprMarathonBalloon, "Hide" );
}
else
{
COMMAND( m_sprLongBalloon, "Hide" );
COMMAND( m_sprMarathonBalloon, "Hide" );
}
} }
break; break;
case TYPE_ROULETTE: case TYPE_ROULETTE:
@@ -1209,9 +1174,6 @@ void ScreenSelectMusic::AfterMusicChange()
ASSERT(0); ASSERT(0);
} }
COMMAND( m_sprLongBalloon, "Hide" );
COMMAND( m_sprMarathonBalloon, "Hide" );
break; break;
case TYPE_COURSE: case TYPE_COURSE:
{ {
@@ -1247,11 +1209,6 @@ void ScreenSelectMusic::AfterMusicChange()
if( index != -1 ) if( index != -1 )
m_MachineRank.SetText( FormatNumberAndSuffix( index+1 ) ); m_MachineRank.SetText( FormatNumberAndSuffix( index+1 ) );
COMMAND( m_sprLongBalloon, "Hide" );
COMMAND( m_sprMarathonBalloon, "Hide" );
break; break;
} }
default: default:
stepmania/src/ScreenSelectMusic.h
-2
View File
@@ -83,8 +83,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;
AutoActor m_sprLongBalloon;
AutoActor m_sprMarathonBalloon;
DifficultyDisplay m_DifficultyDisplay; DifficultyDisplay m_DifficultyDisplay;
BitmapText m_MachineRank; BitmapText m_MachineRank;