diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index b9305785b6..92bc4a6072 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -137,7 +137,6 @@ MusicWheel::MusicWheel() SongOptions so; SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), - GAMESTATE->m_sPreferredGroup, GAMESTATE->GetCurrentStyleDef(), pSong, pNotes, @@ -536,7 +535,7 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas Notes* pNotes; PlayerOptions po; SongOptions so; - SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->m_pCurSong->m_sGroupName, GAMESTATE->GetCurrentStyleDef(), pSong, pNotes, po, so ); + SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyleDef(), pSong, pNotes, po, so ); bool bFoundExtraSong = false; diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 278770cf38..61c14c0fff 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -838,7 +838,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) Notes* pNotes; PlayerOptions po; SongOptions so; - SONGMAN->GetExtraStageInfo( false, GAMESTATE->m_pCurSong->m_sGroupName, GAMESTATE->GetCurrentStyleDef(), pSong, pNotes, po, so ); + SONGMAN->GetExtraStageInfo( false, GAMESTATE->GetCurrentStyleDef(), pSong, pNotes, po, so ); ASSERT(pSong); /* Enable 2nd extra stage if user chose the correct song */ diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 35a88baac5..b753a5d081 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -916,7 +916,7 @@ bool CompareNotesPointersForExtra(const Notes *n1, const Notes *n2) return CompareNotesPointersByRadarValues(n1,n2); } -void SongManager::GetExtraStageInfo( bool bExtra2, CString sPreferredGroup, const StyleDef *sd, +void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd, Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ) { CString Group = GAMESTATE->m_sPreferredGroup; diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index 31db49a6cc..8fa186c719 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -80,7 +80,7 @@ public: void GetOniCourses( vector &AddTo, bool bIncludeAutogen ); // add to if life meter type is BATTERY. void GetEndlessCourses( vector &AddTo, bool bIncludeAutogen ); // add to if set to REPEAT. - void GetExtraStageInfo( bool bExtra2, CString sPreferredGroup, const StyleDef *s, + void GetExtraStageInfo( bool bExtra2, const StyleDef *s, Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ); Song* GetSongFromDir( CString sDir );