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

break off GetExtraStageInfoFromCourse

Browse Source
This commit is contained in:
Glenn Maynard
2002-08-30 20:49:56 +00:00
parent 7cacbe59f7
commit fde01d42a2
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+21 -16
View File
@@ -474,27 +474,32 @@ void SongManager::ReloadCourses()
}
bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredGroup,
Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out )
{
CString sCoursePath = "Songs\\" + sPreferredGroup + "\\" + (bExtra2 ? "extra2" : "extra1") + ".crs";
if( !DoesFileExist(sCoursePath) ) return false;
Course course;
course.LoadFromCRSFile( sCoursePath, m_pSongs );
if( course.m_iStages <= 0 ) return false;
pSongOut = course.m_apSongs[0];
pNotesOut = course.GetNotesForStage( 0 );
if( pNotesOut == NULL ) return false;
po_out.FromString( course.m_asModifiers[0] );
so_out.FromString( course.m_asModifiers[0] );
return true;
}
void SongManager::GetExtraStageInfo( bool bExtra2, CString sPreferredGroup, NotesType nt,
Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out )
{
{
CString sCoursePath = "Songs\\" + sPreferredGroup + "\\" + (bExtra2 ? "extra2" : "extra1") + ".crs";
if( !DoesFileExist(sCoursePath) )
goto load_from_course_failed;
Course course;
course.LoadFromCRSFile( sCoursePath, m_pSongs );
if( course.m_iStages <= 0 )
goto load_from_course_failed;
pSongOut = course.m_apSongs[0];
pNotesOut = course.GetNotesForStage( 0 );
if( pNotesOut == NULL )
goto load_from_course_failed;
po_out.FromString( course.m_asModifiers[0] );
so_out.FromString( course.m_asModifiers[0] );
if(GetExtraStageInfoFromCourse(bExtra2, sPreferredGroup,
pSongOut, pNotesOut, po_out, so_out))
return;
}
load_from_course_failed:
// Choose a hard song for the extra stage
Song* pExtra1Song = NULL; // the absolute hardest Song and Notes. Use this for extra stage 1.
stepmania/src/SongManager.h
+3
View File
@@ -66,6 +66,9 @@ public:
protected:
void LoadStepManiaSongDir( CString sDir, void(*callback)() );
void LoadDWISongDir( CString sDir );
bool GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredGroup,
Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out );
CMapStringToString m_mapGroupToBannerPath; // each song group has a banner associated with it
CStringArray m_arrayGroupNames;
};