simplify
This commit is contained in:
@@ -77,10 +77,10 @@ void CourseContentsList::SetFromGameState()
|
||||
{
|
||||
CourseEntryDisplay& display = m_CourseContentDisplays[m_iNumContents];
|
||||
|
||||
TrailEntry* pte[NUM_PLAYERS];
|
||||
const TrailEntry* pte[NUM_PLAYERS];
|
||||
FOREACH_EnabledPlayer(pn)
|
||||
pte[pn] = &pTrail[0]->m_vEntries[i];
|
||||
display.LoadFromTrailEntry( m_iNumContents+1, pCourse, pte );
|
||||
pte[pn] = &pTrail[pn]->m_vEntries[i];
|
||||
display.LoadFromTrailEntry( m_iNumContents+1, pte );
|
||||
|
||||
m_iNumContents++;
|
||||
}
|
||||
|
||||
@@ -87,15 +87,15 @@ void CourseEntryDisplay::SetDifficulty( PlayerNumber pn, const CString &text, Ra
|
||||
m_textFoot[pn].SetDiffuse( c );
|
||||
}
|
||||
|
||||
void CourseEntryDisplay::LoadFromTrailEntry( int iNum, const Course *pCourse, TrailEntry *tes[NUM_PLAYERS] )
|
||||
void CourseEntryDisplay::LoadFromTrailEntry( int iNum, const TrailEntry *tes[NUM_PLAYERS] )
|
||||
{
|
||||
TrailEntry *te = tes[GAMESTATE->m_MasterPlayerNumber];
|
||||
const TrailEntry *te = tes[GAMESTATE->m_MasterPlayerNumber];
|
||||
bool bMystery = te->bMystery;
|
||||
if( bMystery )
|
||||
{
|
||||
FOREACH_EnabledPlayer(pn)
|
||||
{
|
||||
TrailEntry *te = tes[pn];
|
||||
const TrailEntry *te = tes[pn];
|
||||
Difficulty dc = te->dc;
|
||||
if( dc == DIFFICULTY_INVALID )
|
||||
{
|
||||
@@ -114,7 +114,7 @@ void CourseEntryDisplay::LoadFromTrailEntry( int iNum, const Course *pCourse, Tr
|
||||
{
|
||||
FOREACH_EnabledPlayer(pn)
|
||||
{
|
||||
TrailEntry *te = tes[pn];
|
||||
const TrailEntry *te = tes[pn];
|
||||
RageColor colorNotes = SONGMAN->GetDifficultyColor( te->pSteps->GetDifficulty() );
|
||||
SetDifficulty( pn, ssprintf("%d", te->pSteps->GetMeter()), colorNotes );
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ class CourseEntryDisplay : public ActorFrame
|
||||
public:
|
||||
void Load();
|
||||
|
||||
void LoadFromTrailEntry( int iNum, const Course *pCourse, TrailEntry *te[NUM_PLAYERS] );
|
||||
void LoadFromTrailEntry( int iNum, const TrailEntry *te[NUM_PLAYERS] );
|
||||
|
||||
private:
|
||||
void SetDifficulty( PlayerNumber pn, const CString &text, RageColor c );
|
||||
|
||||
Reference in New Issue
Block a user