review uses of GetTrail

This commit is contained in:
Chris Danford
2004-05-24 06:07:59 +00:00
parent d65404e750
commit 6f75a3d920
8 changed files with 20 additions and 15 deletions
+10 -11
View File
@@ -151,17 +151,6 @@ void PaneDisplay::SetContent( PaneContents c )
if( (g_Contents[c].req&NEED_PROFILE) && !PROFILEMAN->IsUsingProfile( m_PlayerNumber ) )
return;
RadarValues rv;
if( g_Contents[c].req&NEED_NOTES )
rv = GAMESTATE->m_pCurNotes[m_PlayerNumber]->GetRadarValues();
else if( g_Contents[c].req&NEED_COURSE )
{
CourseDifficulty cd = GAMESTATE->m_PreferredCourseDifficulty[m_PlayerNumber];
StepsType st = GAMESTATE->GetCurrentStyleDef()->m_StepsType;
rv = GAMESTATE->m_pCurCourse->GetTrail(st,cd)->GetRadarValues();
}
const Song *pSong = GAMESTATE->m_pCurSong;
const Steps *pSteps = GAMESTATE->m_pCurNotes[m_PlayerNumber];
StepsType st = GAMESTATE->GetCurrentStyleDef()->m_StepsType;
@@ -169,6 +158,16 @@ void PaneDisplay::SetContent( PaneContents c )
const CourseDifficulty cd = GAMESTATE->m_PreferredCourseDifficulty[m_PlayerNumber];
const Trail *pTrail = pCourse ? pCourse->GetTrail(st,cd) : NULL;
RadarValues rv;
if( g_Contents[c].req&NEED_NOTES )
rv = GAMESTATE->m_pCurNotes[m_PlayerNumber]->GetRadarValues();
else if( g_Contents[c].req&NEED_COURSE )
{
ASSERT( pCourse );
rv = pTrail->GetRadarValues();
}
float val = 0;
CString str;
switch( c )