diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 5861eec9a0..59de69e9d8 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -901,10 +901,10 @@ Steps* Song::GetStepsByMeter( StepsType nt, int iMeterLow, int iMeterHigh, bool return vNotes[0]; } -Steps* Song::GetStepsByDescription( StepsType nt, CString sDescription, bool bIncludeAutoGen ) const +Steps* Song::GetStepsByDescription( StepsType nt, CString sDescription ) const { vector vNotes; - GetSteps( vNotes, nt, DIFFICULTY_INVALID, -1, -1, sDescription, bIncludeAutoGen ); + GetSteps( vNotes, nt, DIFFICULTY_INVALID, -1, -1, sDescription ); if( vNotes.size() == 0 ) return NULL; else @@ -912,35 +912,35 @@ Steps* Song::GetStepsByDescription( StepsType nt, CString sDescription, bool bIn } -Steps* Song::GetClosestNotes( StepsType nt, Difficulty dc, bool bIncludeAutoGen ) const +Steps* Song::GetClosestNotes( StepsType nt, Difficulty dc ) const { Difficulty newDC = dc; Steps* pNotes; - pNotes = GetStepsByDifficulty( nt, newDC, bIncludeAutoGen ); + pNotes = GetStepsByDifficulty( nt, newDC ); if( pNotes ) return pNotes; newDC = (Difficulty)(dc-1); CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 ); - pNotes = GetStepsByDifficulty( nt, newDC, bIncludeAutoGen ); + pNotes = GetStepsByDifficulty( nt, newDC ); if( pNotes ) return pNotes; newDC = (Difficulty)(dc+1); CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 ); - pNotes = GetStepsByDifficulty( nt, newDC, bIncludeAutoGen ); + pNotes = GetStepsByDifficulty( nt, newDC ); if( pNotes ) return pNotes; newDC = (Difficulty)(dc-2); CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 ); - pNotes = GetStepsByDifficulty( nt, newDC, bIncludeAutoGen ); + pNotes = GetStepsByDifficulty( nt, newDC ); if( pNotes ) return pNotes; newDC = (Difficulty)(dc+2); CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 ); - pNotes = GetStepsByDifficulty( nt, newDC, bIncludeAutoGen ); + pNotes = GetStepsByDifficulty( nt, newDC ); return pNotes; } -void Song::GetEdits( vector& arrayAddTo, StepsType nt, bool bIncludeAutoGen ) const +void Song::GetEdits( vector& arrayAddTo, StepsType nt ) const { } diff --git a/stepmania/src/song.h b/stepmania/src/song.h index b9ba0fdb59..6fc1820cdd 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -186,9 +186,9 @@ public: void GetSteps( vector& arrayAddTo, StepsType nt = STEPS_TYPE_INVALID, Difficulty dc = DIFFICULTY_INVALID, int iMeterLow = -1, int iMeterHigh = -1, const CString &sDescription = "", bool bIncludeAutoGen = true, int Max = -1 ) const; Steps* GetStepsByDifficulty( StepsType nt, Difficulty dc, bool bIncludeAutoGen = true ) const; Steps* GetStepsByMeter( StepsType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen = true ) const; - Steps* GetStepsByDescription( StepsType nt, CString sDescription, bool bIncludeAutoGen = true ) const; - Steps* GetClosestNotes( StepsType nt, Difficulty dc, bool bIncludeAutoGen = true ) const; - void GetEdits( vector& arrayAddTo, StepsType nt, bool bIncludeAutoGen = true ) const; + Steps* GetStepsByDescription( StepsType nt, CString sDescription ) const; + Steps* GetClosestNotes( StepsType nt, Difficulty dc ) const; + void GetEdits( vector& arrayAddTo, StepsType nt ) const; bool IsEasy( StepsType nt ) const; bool HasEdits( StepsType nt ) const; bool NormallyDisplayed() const;