From 5eb0e9a1287f9f67e032ba0accb986099457f508 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Sep 2005 03:52:22 +0000 Subject: [PATCH] cleanup --- stepmania/src/MusicWheel.cpp | 12 +++------ stepmania/src/ScreenSelectMusic.cpp | 4 +-- stepmania/src/SongManager.cpp | 39 +++++++++++++++++++---------- stepmania/src/SongManager.h | 5 ++-- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 683e38dd43..16e73425da 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -129,8 +129,8 @@ void MusicWheel::Load( CString sType ) GAMESTATE->GetCurrentStyle(), pSong, pSteps, - po, - so ); + &po, + &so ); GAMESTATE->m_pCurSong.Set( pSong ); GAMESTATE->m_pPreferredSong = pSong; FOREACH_HumanPlayer( p ) @@ -413,9 +413,7 @@ void MusicWheel::GetSongList(vector &arraySongs, SortOrder so, CString sP { Song* pSong; Steps* pSteps; - PlayerOptions po; - SongOptions so; - SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps, po, so ); + SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps, NULL, NULL ); if( find( arraySongs.begin(), arraySongs.end(), pSong ) == arraySongs.end() ) arraySongs.push_back( pSong ); @@ -612,9 +610,7 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas { Song* pSong; Steps* pSteps; - PlayerOptions po; - SongOptions so; - SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps, po, so ); + SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyle(), pSong, pSteps, NULL, NULL ); for( unsigned i=0; iGetExtraStageInfo( false, GAMESTATE->GetCurrentStyle(), pSong, pSteps, po, so ); + SONGMAN->GetExtraStageInfo( false, GAMESTATE->GetCurrentStyle(), pSong, pSteps, NULL, NULL ); 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 a71f115bcb..24b0cfd6c2 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -908,7 +908,7 @@ void SongManager::GetCoursesInGroup( vector &AddTo, const CString &sCou } bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredGroup, - Song*& pSongOut, Steps*& pStepsOut, PlayerOptions& po_out, SongOptions& so_out ) + Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ) { const CString sCourseSuffix = sPreferredGroup + "/" + (bExtra2 ? "extra2" : "extra1") + ".crs"; CString sCoursePath = SONGS_DIR + sCourseSuffix; @@ -925,10 +925,16 @@ bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredG if( pTrail->m_vEntries.empty() ) return false; - po_out.Init(); - po_out.FromString( pTrail->m_vEntries[0].Modifiers ); - so_out.Init(); - so_out.FromString( pTrail->m_vEntries[0].Modifiers ); + if( pPlayerOptionsOut != NULL ) + { + pPlayerOptionsOut->Init(); + pPlayerOptionsOut->FromString( pTrail->m_vEntries[0].Modifiers ); + } + if( pSongOptionsOut != NULL ) + { + pSongOptionsOut->Init(); + pSongOptionsOut->FromString( pTrail->m_vEntries[0].Modifiers ); + } pSongOut = pTrail->m_vEntries[0].pSong; pStepsOut = pTrail->m_vEntries[0].pSteps; @@ -954,7 +960,7 @@ bool CompareNotesPointersForExtra(const Steps *n1, const Steps *n2) } void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, - Song*& pSongOut, Steps*& pStepsOut, PlayerOptions& po_out, SongOptions& so_out ) + Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ) { CString sGroup = GAMESTATE->m_sPreferredSongGroup; if( sGroup == GROUP_ALL ) @@ -973,7 +979,7 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, GAMESTATE->m_pCurSong? GAMESTATE->m_pCurSong->GetSongDir().c_str():"", GAMESTATE->m_pCurSong? GAMESTATE->m_pCurSong->m_sGroupName.c_str():"") ); - if(GetExtraStageInfoFromCourse(bExtra2, sGroup, pSongOut, pStepsOut, po_out, so_out)) + if( GetExtraStageInfoFromCourse(bExtra2, sGroup, pSongOut, pStepsOut, pPlayerOptionsOut, pSongOptionsOut) ) return; // Choose a hard song for the extra stage @@ -1026,12 +1032,19 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, pStepsOut = (bExtra2 ? pExtra2Notes : pExtra1Notes); - po_out.Init(); - so_out.Init(); - po_out.m_fScrolls[PlayerOptions::SCROLL_REVERSE] = 1; - po_out.m_fScrollSpeed = 1.5f; - so_out.m_DrainType = (bExtra2 ? SongOptions::DRAIN_SUDDEN_DEATH : SongOptions::DRAIN_NO_RECOVER); - po_out.m_fDark = 1; + if( pPlayerOptionsOut != NULL ) + { + pPlayerOptionsOut->Init(); + pPlayerOptionsOut->m_fScrolls[PlayerOptions::SCROLL_REVERSE] = 1; + pPlayerOptionsOut->m_fScrollSpeed = 1.5f; + pPlayerOptionsOut->m_fDark = 1; + } + + if( pSongOptionsOut != NULL ) + { + pSongOptionsOut->Init(); + pSongOptionsOut->m_DrainType = (bExtra2 ? SongOptions::DRAIN_SUDDEN_DEATH : SongOptions::DRAIN_NO_RECOVER); + } } Song* SongManager::GetRandomSong() diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index 6c71414a9d..6642858795 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -96,8 +96,7 @@ public: void GetCoursesInGroup( vector &AddTo, const CString &sCourseGroup, bool bIncludeAutogen ); void GetExtraStageInfo( bool bExtra2, const Style *s, - Song*& pSongOut, Steps*& pStepsOut, PlayerOptions& po_out, SongOptions& so_out ); - + Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ); Song* GetSongFromDir( CString sDir ); Course* GetCourseFromPath( CString sPath ); // path to .crs file, or path to song group dir Course* GetCourseFromName( CString sName ); @@ -117,7 +116,7 @@ protected: void LoadStepManiaSongDir( CString sDir, LoadingWindow *ld ); void LoadDWISongDir( CString sDir ); bool GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredGroup, - Song*& pSongOut, Steps*& pStepsOut, PlayerOptions& po_out, SongOptions& so_out ); + Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ); void SanityCheckGroupDir( CString sDir ) const; void AddGroup( CString sDir, CString sGroupDirName ); int GetNumEditsLoadedFromProfile( ProfileSlot slot ) const;