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

merge AfterStepsChange and AfterTrailChange

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-17 01:22:20 +00:00
parent 5328536c22
commit deb04eb0ed
2 changed files with 37 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+36 -43
View File
@@ -606,7 +606,7 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
vpns.push_back( p ); vpns.push_back( p );
} }
} }
AfterStepsChange( vpns ); AfterStepsOrTrailChange( vpns );
} }
break; break;
@@ -628,7 +628,7 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
vpns.push_back( p ); vpns.push_back( p );
} }
} }
AfterTrailChange( vpns ); AfterStepsOrTrailChange( vpns );
} }
break; break;
@@ -651,7 +651,7 @@ void ScreenSelectMusic::ChangeDifficulty( PlayerNumber pn, int dir )
vpns.push_back( p ); vpns.push_back( p );
} }
} }
AfterStepsChange( vpns ); AfterStepsOrTrailChange( vpns );
break; break;
} }
case TYPE_SORT: case TYPE_SORT:
@@ -879,55 +879,51 @@ void ScreenSelectMusic::MenuBack( PlayerNumber pn )
Cancel( SM_GoToPrevScreen ); Cancel( SM_GoToPrevScreen );
} }
void ScreenSelectMusic::AfterStepsChange( const vector<PlayerNumber> &vpns ) void ScreenSelectMusic::AfterStepsOrTrailChange( const vector<PlayerNumber> &vpns )
{ {
FOREACH_CONST( PlayerNumber, vpns, p ) FOREACH_CONST( PlayerNumber, vpns, p )
{ {
PlayerNumber pn = *p; PlayerNumber pn = *p;
ASSERT( GAMESTATE->IsHumanPlayer(pn) ); ASSERT( GAMESTATE->IsHumanPlayer(pn) );
CLAMP( m_iSelection[pn], 0, m_vpSteps.size()-1 ); if( GAMESTATE->m_pCurSong )
Song* pSong = GAMESTATE->m_pCurSong;
Steps* pSteps = m_vpSteps.empty()? NULL: m_vpSteps[m_iSelection[pn]];
GAMESTATE->m_pCurSteps[pn].Set( pSteps );
GAMESTATE->m_pCurTrail[pn].Set( NULL );
int iScore = 0;
if( pSteps )
{ {
const Profile *pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile(); CLAMP( m_iSelection[pn], 0, m_vpSteps.size()-1 );
iScore = pProfile->GetStepsHighScoreList(pSong,pSteps).GetTopScore().GetScore();
Song* pSong = GAMESTATE->m_pCurSong;
Steps* pSteps = m_vpSteps.empty()? NULL: m_vpSteps[m_iSelection[pn]];
GAMESTATE->m_pCurSteps[pn].Set( pSteps );
GAMESTATE->m_pCurTrail[pn].Set( NULL );
int iScore = 0;
if( pSteps )
{
const Profile *pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile();
iScore = pProfile->GetStepsHighScoreList(pSong,pSteps).GetTopScore().GetScore();
}
m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) );
} }
else
{
CLAMP( m_iSelection[pn], 0, m_vpTrails.size()-1 );
m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) ); Course* pCourse = GAMESTATE->m_pCurCourse;
} Trail* pTrail = m_vpTrails.empty()? NULL: m_vpTrails[m_iSelection[pn]];
}
void ScreenSelectMusic::AfterTrailChange( const vector<PlayerNumber> &vpns ) GAMESTATE->m_pCurSteps[pn].Set( NULL );
{ GAMESTATE->m_pCurTrail[pn].Set( pTrail );
FOREACH_CONST( PlayerNumber, vpns, p )
{
PlayerNumber pn = *p;
ASSERT( GAMESTATE->IsHumanPlayer(pn) );
CLAMP( m_iSelection[pn], 0, m_vpTrails.size()-1 ); int iScore = 0;
if( pTrail )
{
const Profile *pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile();
iScore = pProfile->GetCourseHighScoreList(pCourse,pTrail).GetTopScore().GetScore();
}
Course* pCourse = GAMESTATE->m_pCurCourse; m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) );
Trail* pTrail = m_vpTrails.empty()? NULL: m_vpTrails[m_iSelection[pn]];
GAMESTATE->m_pCurSteps[pn].Set( NULL );
GAMESTATE->m_pCurTrail[pn].Set( pTrail );
int iScore = 0;
if( pTrail )
{
const Profile *pProfile = PROFILEMAN->IsPersistentProfile(pn) ? PROFILEMAN->GetProfile(pn) : PROFILEMAN->GetMachineProfile();
iScore = pProfile->GetCourseHighScoreList(pCourse,pTrail).GetTopScore().GetScore();
} }
m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) );
} }
} }
@@ -1252,10 +1248,7 @@ void ScreenSelectMusic::AfterMusicChange()
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
vpns.push_back( p ); vpns.push_back( p );
if( GAMESTATE->m_pCurCourse ) AfterStepsOrTrailChange( vpns );
AfterTrailChange( vpns );
else
AfterStepsChange( vpns );
} }
// lua start // lua start
stepmania/src/ScreenSelectMusic.h
+1 -2
View File
@@ -49,8 +49,7 @@ protected:
void ChangeDifficulty( PlayerNumber pn, int dir ); void ChangeDifficulty( PlayerNumber pn, int dir );
void AfterStepsChange( const vector<PlayerNumber> &vpns ); void AfterStepsOrTrailChange( const vector<PlayerNumber> &vpns );
void AfterTrailChange( const vector<PlayerNumber> &vpns );
void SwitchToPreferredDifficulty(); void SwitchToPreferredDifficulty();
void AfterMusicChange(); void AfterMusicChange();