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

use course accessors

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-17 05:09:36 +00:00
parent d5c2331ab7
commit 5afb4c7768
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CourseContentsFrame.cpp
+1 -2
View File
@@ -104,7 +104,7 @@ void CourseContentsFrame::SetFromCourse( Course* pCourse )
for( int i=0; i<min(pCourse->m_iStages, MAX_TOTAL_CONTENTS); i++ ) for( int i=0; i<min(pCourse->m_iStages, MAX_TOTAL_CONTENTS); i++ )
{ {
Song* pSong = pCourse->m_apSongs[i]; Song* pSong = pCourse->GetSong(i);
Notes* pNotes = pCourse->GetNotesForStage(i); Notes* pNotes = pCourse->GetNotesForStage(i);
if( pNotes == NULL ) if( pNotes == NULL )
@@ -154,7 +154,6 @@ void CourseContentsFrame::DrawPrimitives()
m_quad.SetY( ((MAX_VISIBLE_CONTENTS-1)/2 + 1) * CONTENTS_BAR_HEIGHT ); m_quad.SetY( ((MAX_VISIBLE_CONTENTS-1)/2 + 1) * CONTENTS_BAR_HEIGHT );
m_quad.Draw(); m_quad.Draw();
int iItemToDraw = (int)m_fItemAtTopOfList; int iItemToDraw = (int)m_fItemAtTopOfList;
// HACK: Insert a little pause as a new item appears on the screen // HACK: Insert a little pause as a new item appears on the screen
stepmania/src/ScreenGameplay.cpp
+2 -4
View File
@@ -717,8 +717,6 @@ void ScreenGameplay::Update( float fDeltaTime )
GAMESTATE->m_bFreeze = bFreeze; GAMESTATE->m_bFreeze = bFreeze;
m_MaxCombo.SetText( ssprintf("%d", m_Player[GAMESTATE->m_MasterPlayerNumber].GetPlayersMaxCombo()) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */ m_MaxCombo.SetText( ssprintf("%d", m_Player[GAMESTATE->m_MasterPlayerNumber].GetPlayersMaxCombo()) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */
// printf( "m_fSongBeat = %f\n", GAMESTATE->m_fSongBeat );
//LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() ); //LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() );
@@ -1033,7 +1031,7 @@ void SaveChanges()
{ {
for( int i=0; i<GAMESTATE->m_pCurCourse->m_iStages; i++ ) for( int i=0; i<GAMESTATE->m_pCurCourse->m_iStages; i++ )
{ {
Song* pSong = GAMESTATE->m_pCurCourse->m_apSongs[i]; Song* pSong = GAMESTATE->m_pCurCourse->GetSong(i);
pSong->Save(); pSong->Save();
} }
} }
@@ -1057,7 +1055,7 @@ void DontSaveChanges()
{ {
for( int i=0; i<GAMESTATE->m_pCurCourse->m_iStages; i++ ) for( int i=0; i<GAMESTATE->m_pCurCourse->m_iStages; i++ )
{ {
Song* pSong = GAMESTATE->m_pCurCourse->m_apSongs[i]; Song* pSong = GAMESTATE->m_pCurCourse->GetSong(i);
ld.LoadFromSMFile( GAMESTATE->m_pCurSong->GetCacheFilePath(), *pSong ); ld.LoadFromSMFile( GAMESTATE->m_pCurSong->GetCacheFilePath(), *pSong );
} }
} }
stepmania/src/ScreenSelectCourse.cpp
+1 -1
View File
@@ -332,7 +332,7 @@ void ScreenSelectCourse::AfterCourseChange()
m_textNumSongs.SetText( ssprintf("%d", pCourse->m_iStages) ); m_textNumSongs.SetText( ssprintf("%d", pCourse->m_iStages) );
float fTotalSeconds = 0; float fTotalSeconds = 0;
for( int i=0; i<pCourse->m_iStages; i++ ) for( int i=0; i<pCourse->m_iStages; i++ )
fTotalSeconds += pCourse->m_apSongs[i]->m_fMusicLengthSeconds; fTotalSeconds += pCourse->GetSong(i)->m_fMusicLengthSeconds;
m_textTime.SetText( SecondsToTime(fTotalSeconds) ); m_textTime.SetText( SecondsToTime(fTotalSeconds) );
m_Banner.SetFromCourse( pCourse ); m_Banner.SetFromCourse( pCourse );
stepmania/src/SongManager.cpp
+3 -3
View File
@@ -522,12 +522,12 @@ bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredG
course.LoadFromCRSFile( sCoursePath, m_pSongs ); course.LoadFromCRSFile( sCoursePath, m_pSongs );
if( course.m_iStages <= 0 ) return false; if( course.m_iStages <= 0 ) return false;
pSongOut = course.m_apSongs[0]; pSongOut = course.GetSong(0);
pNotesOut = course.GetNotesForStage( 0 ); pNotesOut = course.GetNotesForStage( 0 );
if( pNotesOut == NULL ) return false; if( pNotesOut == NULL ) return false;
po_out.FromString( course.m_asModifiers[0] ); po_out.FromString( course.GetModifiers(0) );
so_out.FromString( course.m_asModifiers[0] ); so_out.FromString( course.GetModifiers(0) );
return true; return true;
} }