default params
This commit is contained in:
@@ -372,7 +372,7 @@ void MusicWheel::GetSongList( vector<Song*> &arraySongs, SortOrder so, const RSt
|
|||||||
{
|
{
|
||||||
Song* pSong;
|
Song* pSong;
|
||||||
Steps* pSteps;
|
Steps* pSteps;
|
||||||
SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps, NULL, NULL );
|
SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps );
|
||||||
|
|
||||||
if( find( arraySongs.begin(), arraySongs.end(), pSong ) == arraySongs.end() )
|
if( find( arraySongs.begin(), arraySongs.end(), pSong ) == arraySongs.end() )
|
||||||
arraySongs.push_back( pSong );
|
arraySongs.push_back( pSong );
|
||||||
@@ -563,7 +563,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
|
|||||||
{
|
{
|
||||||
Song* pSong;
|
Song* pSong;
|
||||||
Steps* pSteps;
|
Steps* pSteps;
|
||||||
SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps, NULL, NULL );
|
SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps );
|
||||||
|
|
||||||
for( unsigned i=0; i<arrayWheelItemDatas.size(); i++ )
|
for( unsigned i=0; i<arrayWheelItemDatas.size(); i++ )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public:
|
|||||||
void GetPreferredSortCourses( CourseType ct, vector<Course*> &AddTo, bool bIncludeAutogen ) const;
|
void GetPreferredSortCourses( CourseType ct, vector<Course*> &AddTo, bool bIncludeAutogen ) const;
|
||||||
|
|
||||||
void GetExtraStageInfo( bool bExtra2, const Style *s,
|
void GetExtraStageInfo( bool bExtra2, const Style *s,
|
||||||
Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut );
|
Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut = NULL, SongOptions *pSongOptionsOut = NULL );
|
||||||
Song* GetSongFromDir( RString sDir ) const;
|
Song* GetSongFromDir( RString sDir ) const;
|
||||||
Course* GetCourseFromPath( RString sPath ) const; // path to .crs file, or path to song group dir
|
Course* GetCourseFromPath( RString sPath ) const; // path to .crs file, or path to song group dir
|
||||||
Course* GetCourseFromName( RString sName ) const;
|
Course* GetCourseFromName( RString sName ) const;
|
||||||
|
|||||||
Reference in New Issue
Block a user