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

rename

Browse Source
This commit is contained in:
Glenn Maynard
2003-07-21 23:16:06 +00:00
parent 14626dbf92
commit d0502bfddb
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BPMDisplay.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ void BPMDisplay::SetBPM( const Course* pCourse )
continue; continue;
} }
Song *pSong = ci[i].Song; Song *pSong = ci[i].pSong;
ASSERT( pSong ); ASSERT( pSong );
switch( pSong->m_DisplayBPMType ) switch( pSong->m_DisplayBPMType )
{ {
stepmania/src/Course.cpp
+7 -7
View File
@@ -140,7 +140,7 @@ int Course::GetMeter() const
} }
} }
else else
fTotalMeter += ci[c].Notes->GetMeter(); fTotalMeter += ci[c].pNotes->GetMeter();
} }
return (int)roundf( fTotalMeter / ci.size() ); return (int)roundf( fTotalMeter / ci.size() );
} }
@@ -448,7 +448,7 @@ bool Course::HasDifficult( NotesType nt ) const
continue; continue;
} }
if( Normal[i].Song != Hard[i].Song || Normal[i].Notes != Hard[i].Notes ) if( Normal[i].pSong != Hard[i].pSong || Normal[i].pNotes != Hard[i].pNotes )
return true; return true;
} }
return false; return false;
@@ -474,8 +474,8 @@ bool Course::GetFirstStageInfo(
if( ci.empty() ) if( ci.empty() )
return false; return false;
pSongOut = ci[0].Song; pSongOut = ci[0].pSong;
pNotesOut = ci[0].Notes; pNotesOut = ci[0].pNotes;
sModifiersOut = ci[0].Modifiers; sModifiersOut = ci[0].Modifiers;
return true; return true;
} }
@@ -607,8 +607,8 @@ void Course::GetCourseInfo( NotesType nt, vector<Course::Info> &ci ) const
} }
Info cinfo; Info cinfo;
cinfo.Song = pSong; cinfo.pSong = pSong;
cinfo.Notes = pNotes; cinfo.pNotes = pNotes;
cinfo.Modifiers = e.modifiers; cinfo.Modifiers = e.modifiers;
cinfo.Random = ( e.type == Entry::random || e.type == Entry::random_within_group ); cinfo.Random = ( e.type == Entry::random || e.type == Entry::random_within_group );
cinfo.CourseIndex = i; cinfo.CourseIndex = i;
@@ -667,7 +667,7 @@ bool Course::GetTotalSeconds( float& fSecondsOut ) const
{ {
if( ci[i].Random ) if( ci[i].Random )
return false; return false;
fSecondsOut += ci[i].Song->m_fMusicLengthSeconds; fSecondsOut += ci[i].pSong->m_fMusicLengthSeconds;
} }
return true; return true;
} }
stepmania/src/Course.h
+3 -3
View File
@@ -62,9 +62,9 @@ public:
struct Info struct Info
{ {
Info(): Song(NULL), Notes(NULL), Random(false) { } Info(): pSong(NULL), pNotes(NULL), Random(false) { }
Song* Song; Song* pSong;
Notes* Notes; Notes* pNotes;
CString Modifiers; CString Modifiers;
bool Random; bool Random;
/* Corresponding entry in m_entries: */ /* Corresponding entry in m_entries: */
stepmania/src/CourseContentsList.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ void CourseContentsList::SetFromCourse( Course* pCourse )
} }
else else
{ {
display.LoadFromSongAndNotes( m_iNumContents+1, ci[i].Song, ci[i].Notes, ci[i].Modifiers ); display.LoadFromSongAndNotes( m_iNumContents+1, ci[i].pSong, ci[i].pNotes, ci[i].Modifiers );
} }
m_iNumContents ++; m_iNumContents ++;