diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index d3241ec2c7..865e0960a9 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -69,14 +69,16 @@ RString CourseEntry::GetTextDescription() const vsEntryDescription.push_back( pSong->GetTranslitFullTitle() ); else vsEntryDescription.push_back( "Random" ); - if( !sSongGroup.empty() ) - vsEntryDescription.push_back( sSongGroup ); - if( baseDifficulty != DIFFICULTY_INVALID && baseDifficulty != DIFFICULTY_MEDIUM ) - vsEntryDescription.push_back( DifficultyToLocalizedString(baseDifficulty) ); - if( iLowMeter != -1 ) - vsEntryDescription.push_back( ssprintf("Low meter: %d", iLowMeter) ); - if( iHighMeter != -1 ) - vsEntryDescription.push_back( ssprintf("High meter: %d", iHighMeter) ); + if( !songCriteria.m_sGroupName.empty() ) + vsEntryDescription.push_back( songCriteria.m_sGroupName ); + if( !songCriteria.m_sGenre.empty() ) + vsEntryDescription.push_back( songCriteria.m_sGenre ); + if( stepsCriteria.m_difficulty != DIFFICULTY_INVALID && stepsCriteria.m_difficulty != DIFFICULTY_MEDIUM ) + vsEntryDescription.push_back( DifficultyToLocalizedString(stepsCriteria.m_difficulty) ); + if( stepsCriteria.m_iLowMeter != -1 ) + vsEntryDescription.push_back( ssprintf("Low meter: %d", stepsCriteria.m_iLowMeter) ); + if( stepsCriteria.m_iHighMeter != -1 ) + vsEntryDescription.push_back( ssprintf("High meter: %d", stepsCriteria.m_iHighMeter) ); if( songSort != SongSort_Randomize ) vsEntryDescription.push_back( "Sort: %d" + SongSortToLocalizedString(songSort) ); if( songSort != SongSort_Randomize && iChooseIndex != 0 ) @@ -487,7 +489,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) if( IsAnEdit() && UNLOCKMAN->SongIsLocked(e->pSong) ) continue; // Choose an exact song, if we have matching steps and all - e->pSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter ); + SongUtil::GetSteps( e->pSong, vpPossibleSteps, st, e->stepsCriteria.m_difficulty, e->stepsCriteria.m_iLowMeter, e->stepsCriteria.m_iHighMeter ); // Remove all locked steps. if( IsAnEdit() ) RemoveIf( vpPossibleSteps, bind1st(ptr_fun(StepsIsLocked), e->pSong) ); @@ -510,11 +512,11 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) vector vpPossibleSongs; FOREACH( Song*, vpAllPossibleSongs, song ) { - if( !e->sSongGroup.empty() && (*song)->m_sGroupName != e->sSongGroup ) + if( !e->songCriteria.Matches( *song ) ) continue; vector vpMatchingSteps; - (*song)->GetSteps( vpMatchingSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter ); + SongUtil::GetSteps( *song, vpMatchingSteps, st, e->stepsCriteria.m_difficulty, e->stepsCriteria.m_iLowMeter, e->stepsCriteria.m_iHighMeter ); StepsUtil::RemoveLockedSteps( *song, vpMatchingSteps ); if( vpMatchingSteps.empty() ) @@ -534,7 +536,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) pResolvedSong = vpPossibleSongs[e->iChooseIndex]; else continue; - pResolvedSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter ); + SongUtil::GetSteps( pResolvedSong, vpPossibleSteps, st, e->stepsCriteria.m_difficulty, e->stepsCriteria.m_iLowMeter, e->stepsCriteria.m_iHighMeter ); StepsUtil::RemoveLockedSteps( pResolvedSong, vpPossibleSteps ); } @@ -550,8 +552,8 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) * either easier or harder than the base difficulty. If no such steps exist, then * just use the one we already have. */ Difficulty dc = pResolvedSteps->GetDifficulty(); - int iLowMeter = e->iLowMeter; - int iHighMeter = e->iHighMeter; + int iLowMeter = e->stepsCriteria.m_iLowMeter; + int iHighMeter = e->stepsCriteria.m_iHighMeter; if( cd != DIFFICULTY_MEDIUM && !e->bNoDifficult ) { Difficulty new_dc = (Difficulty)(dc + cd - DIFFICULTY_MEDIUM); @@ -560,7 +562,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) bool bChangedDifficulty = false; if( new_dc != dc ) { - Steps* pNewSteps = pResolvedSong->GetStepsByDifficulty( st, new_dc ); + Steps* pNewSteps = SongUtil::GetStepsByDifficulty( pResolvedSong, st, new_dc ); if( pNewSteps ) { dc = new_dc; @@ -577,7 +579,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) * on the original range, bump the steps based on course difficulty, and * then retroactively tweak the low_meter/high_meter so course displays * line up. */ - if( e->baseDifficulty == DIFFICULTY_INVALID && bChangedDifficulty ) + if( e->stepsCriteria.m_difficulty == DIFFICULTY_INVALID && bChangedDifficulty ) { /* Minimum and maximum to add to make the meter range contain the actual * meter: */ @@ -610,7 +612,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) /* If we chose based on meter (not difficulty), then store DIFFICULTY_INVALID, so * other classes can tell that we used meter. */ - if( e->baseDifficulty == DIFFICULTY_INVALID ) + if( e->stepsCriteria.m_difficulty == DIFFICULTY_INVALID ) { te.dc = DIFFICULTY_INVALID; } diff --git a/stepmania/src/CourseLoaderCRS.cpp b/stepmania/src/CourseLoaderCRS.cpp index 653543a559..a41f294db1 100644 --- a/stepmania/src/CourseLoaderCRS.cpp +++ b/stepmania/src/CourseLoaderCRS.cpp @@ -165,7 +165,7 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou split( sSong, "/", bits ); if( bits.size() == 2 ) { - new_entry.sSongGroup = bits[0]; + new_entry.songCriteria.m_sGroupName = bits[0]; } else { @@ -174,7 +174,7 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou sPath.c_str(), sSong.c_str() ); } - if( !SONGMAN->DoesSongGroupExist(new_entry.sSongGroup) ) + if( !SONGMAN->DoesSongGroupExist(new_entry.songCriteria.m_sGroupName) ) { /* XXX: We need a place to put "user warnings". This is too loud for info.txt-- * it obscures important warnings--and regular users never look there, anyway. */ @@ -193,7 +193,7 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou if( bits.size() == 2 ) { - new_entry.sSongGroup = bits[0]; + new_entry.songCriteria.m_sGroupName = bits[0]; new_entry.pSong = SONGMAN->FindSong( bits[0], bits[1] ); } else if( bits.size() == 1 ) @@ -212,18 +212,18 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou } } - new_entry.baseDifficulty = StringToDifficulty( sParams[2] ); - if( new_entry.baseDifficulty == DIFFICULTY_INVALID ) + new_entry.stepsCriteria.m_difficulty = StringToDifficulty( sParams[2] ); + if( new_entry.stepsCriteria.m_difficulty == DIFFICULTY_INVALID ) { - int retval = sscanf( sParams[2], "%d..%d", &new_entry.iLowMeter, &new_entry.iHighMeter ); + int retval = sscanf( sParams[2], "%d..%d", &new_entry.stepsCriteria.m_iLowMeter, &new_entry.stepsCriteria.m_iHighMeter ); if( retval == 1 ) - new_entry.iHighMeter = new_entry.iLowMeter; + new_entry.stepsCriteria.m_iHighMeter = new_entry.stepsCriteria.m_iLowMeter; else if( retval != 2 ) { LOG->Warn( "Course file '%s' contains an invalid difficulty setting: \"%s\", 3..6 used instead", sPath.c_str(), sParams[2].c_str() ); - new_entry.iLowMeter = 3; - new_entry.iHighMeter = 6; + new_entry.stepsCriteria.m_iLowMeter = 3; + new_entry.stepsCriteria.m_iHighMeter = 6; } } diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index 7c92d845d2..de700e7af8 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -13,6 +13,7 @@ #include #include #include +#include int randseed = time(NULL); diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 0796cc7e60..ab84b9ea03 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -22,6 +22,7 @@ #include "RageLog.h" #include "song.h" #include "InputEventPlus.h" +#include "SongUtil.h" #include "RageInput.h" AutoScreenMessage( SM_NoSongs ) @@ -472,7 +473,7 @@ void ScreenNetSelectMusic::StartSelectedSong() FOREACH_EnabledPlayer (pn) { GAMESTATE->m_PreferredDifficulty[pn].Set( m_DC[pn] ); - Steps * pSteps = pSong->GetStepsByDifficulty(st,m_DC[pn]); + Steps *pSteps = SongUtil::GetStepsByDifficulty(pSong, st, m_DC[pn]); GAMESTATE->m_pCurSteps[pn].Set( pSteps ); } @@ -501,7 +502,7 @@ void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn ) StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; - Steps * pSteps = GAMESTATE->m_pCurSong->GetStepsByDifficulty( st, m_DC[pn] ); + Steps * pSteps = SongUtil::GetStepsByDifficulty( GAMESTATE->m_pCurSong, st, m_DC[pn] ); GAMESTATE->m_pCurSteps[pn].Set( pSteps ); if ( ( m_DC[pn] < NUM_Difficulty ) && ( m_DC[pn] >= DIFFICULTY_BEGINNER ) )