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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-03 20:49:10 +00:00
parent b1bbce2edb
commit 6696e26acf
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CourseContentsList.cpp
+3 -3
View File
@@ -77,10 +77,10 @@ void CourseContentsList::SetFromGameState()
{ {
CourseEntryDisplay& display = m_CourseContentDisplays[m_iNumContents]; CourseEntryDisplay& display = m_CourseContentDisplays[m_iNumContents];
TrailEntry* pte[NUM_PLAYERS]; const TrailEntry* pte[NUM_PLAYERS];
FOREACH_EnabledPlayer(pn) FOREACH_EnabledPlayer(pn)
pte[pn] = &pTrail[0]->m_vEntries[i]; pte[pn] = &pTrail[pn]->m_vEntries[i];
display.LoadFromTrailEntry( m_iNumContents+1, pCourse, pte ); display.LoadFromTrailEntry( m_iNumContents+1, pte );
m_iNumContents++; m_iNumContents++;
} }
stepmania/src/CourseEntryDisplay.cpp
+4 -4
View File
@@ -87,15 +87,15 @@ void CourseEntryDisplay::SetDifficulty( PlayerNumber pn, const CString &text, Ra
m_textFoot[pn].SetDiffuse( c ); 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; bool bMystery = te->bMystery;
if( bMystery ) if( bMystery )
{ {
FOREACH_EnabledPlayer(pn) FOREACH_EnabledPlayer(pn)
{ {
TrailEntry *te = tes[pn]; const TrailEntry *te = tes[pn];
Difficulty dc = te->dc; Difficulty dc = te->dc;
if( dc == DIFFICULTY_INVALID ) if( dc == DIFFICULTY_INVALID )
{ {
@@ -114,7 +114,7 @@ void CourseEntryDisplay::LoadFromTrailEntry( int iNum, const Course *pCourse, Tr
{ {
FOREACH_EnabledPlayer(pn) FOREACH_EnabledPlayer(pn)
{ {
TrailEntry *te = tes[pn]; const TrailEntry *te = tes[pn];
RageColor colorNotes = SONGMAN->GetDifficultyColor( te->pSteps->GetDifficulty() ); RageColor colorNotes = SONGMAN->GetDifficultyColor( te->pSteps->GetDifficulty() );
SetDifficulty( pn, ssprintf("%d", te->pSteps->GetMeter()), colorNotes ); SetDifficulty( pn, ssprintf("%d", te->pSteps->GetMeter()), colorNotes );
} }
stepmania/src/CourseEntryDisplay.h
+1 -1
View File
@@ -28,7 +28,7 @@ class CourseEntryDisplay : public ActorFrame
public: public:
void Load(); void Load();
void LoadFromTrailEntry( int iNum, const Course *pCourse, TrailEntry *te[NUM_PLAYERS] ); void LoadFromTrailEntry( int iNum, const TrailEntry *te[NUM_PLAYERS] );
private: private:
void SetDifficulty( PlayerNumber pn, const CString &text, RageColor c ); void SetDifficulty( PlayerNumber pn, const CString &text, RageColor c );