show grades based on StepsType of CurSteps (fixes grades incorrect with AutoStyle

This commit is contained in:
Chris Danford
2008-06-24 00:38:32 +00:00
parent f3d5c8d865
commit a279b360ba
+10 -2
View File
@@ -297,6 +297,14 @@ void MusicWheelItem::RefreshGrades()
else else
continue; continue;
StepsType st;
if( GAMESTATE->m_pCurSteps[p] )
st = GAMESTATE->m_pCurSteps[p]->m_StepsType;
else if( GAMESTATE->m_pCurTrail[p] )
st = GAMESTATE->m_pCurTrail[p]->m_StepsType;
else
st = GAMESTATE->m_pCurStyle->m_StepsType;
m_pGradeDisplay[p]->SetVisible( true ); m_pGradeDisplay[p]->SetVisible( true );
@@ -307,13 +315,13 @@ void MusicWheelItem::RefreshGrades()
{ {
if( pWID->m_pSong ) if( pWID->m_pSong )
{ {
const Steps* pSteps = SongUtil::GetStepsByDifficulty( pWID->m_pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, dc ); const Steps* pSteps = SongUtil::GetStepsByDifficulty( pWID->m_pSong, st, dc );
if( pSteps != NULL ) if( pSteps != NULL )
pHSL = &pProfile->GetStepsHighScoreList(pWID->m_pSong, pSteps); pHSL = &pProfile->GetStepsHighScoreList(pWID->m_pSong, pSteps);
} }
else if( pWID->m_pCourse ) else if( pWID->m_pCourse )
{ {
const Trail *pTrail = pWID->m_pCourse->GetTrail( GAMESTATE->GetCurrentStyle()->m_StepsType, dc ); const Trail *pTrail = pWID->m_pCourse->GetTrail( st, dc );
if( pTrail != NULL ) if( pTrail != NULL )
pHSL = &pProfile->GetCourseHighScoreList( pWID->m_pCourse, pTrail ); pHSL = &pProfile->GetCourseHighScoreList( pWID->m_pCourse, pTrail );
} }