From 0a5d0fb73f0ce8812534efbdade8ba84fb8c54e2 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 2 Jun 2004 05:52:16 +0000 Subject: [PATCH] name cleanup --- stepmania/src/DifficultyDisplay.cpp | 2 +- stepmania/src/MusicWheel.cpp | 2 +- stepmania/src/Song.cpp | 6 +++--- stepmania/src/song.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/DifficultyDisplay.cpp b/stepmania/src/DifficultyDisplay.cpp index 702ba8512e..c58bf31836 100644 --- a/stepmania/src/DifficultyDisplay.cpp +++ b/stepmania/src/DifficultyDisplay.cpp @@ -35,7 +35,7 @@ void DifficultyDisplay::SetDifficulties( const Song* pSong, StepsType curType ) { for( int diff = DIFFICULTY_BEGINNER; diff <= DIFFICULTY_CHALLENGE; ++diff ) { - if( pSong->SongHasNotesTypeAndDifficulty( curType, Difficulty(diff) ) ) + if( pSong->HasStepsTypeAndDifficulty( curType, Difficulty(diff) ) ) m_difficulty[diff].Command( ICONONCOMMAND ); else m_difficulty[diff].Command( ICONOFFCOMMAND ); diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 06cd69c1a3..2c968d518b 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -1527,7 +1527,7 @@ Song* MusicWheel::GetSelectedSong() { Song* pSong = m_CurWheelItemData[iSelection]->m_pSong; FOREACH( Difficulty, vDifficultiesToRequire, d ) - if( !pSong->SongHasNotesTypeAndDifficulty(st,*d) ) + if( !pSong->HasStepsTypeAndDifficulty(st,*d) ) goto skip_song; return pSong; } diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 95021f0fb8..32e2e50e41 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -960,17 +960,17 @@ Steps* Song::GetClosestNotes( StepsType st, Difficulty dc ) const /* Return whether the song is playable in the given style. */ bool Song::SongCompleteForStyle( const StyleDef *st ) const { - return SongHasNotesType( st->m_StepsType ); + return HasStepsType( st->m_StepsType ); } -bool Song::SongHasNotesType( StepsType st ) const +bool Song::HasStepsType( StepsType st ) const { vector add; GetSteps( add, st, DIFFICULTY_INVALID, -1, -1, "", true, 1 ); return !add.empty(); } -bool Song::SongHasNotesTypeAndDifficulty( StepsType st, Difficulty dc ) const +bool Song::HasStepsTypeAndDifficulty( StepsType st, Difficulty dc ) const { vector add; GetSteps( add, st, dc, -1, -1, "", true, 1 ); diff --git a/stepmania/src/song.h b/stepmania/src/song.h index de1438b0e7..5b2f47b818 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -175,8 +175,8 @@ public: vector m_vpSteps; bool SongCompleteForStyle( const StyleDef *st ) const; - bool SongHasNotesType( StepsType st ) const; - bool SongHasNotesTypeAndDifficulty( StepsType st, Difficulty dc ) const; + bool HasStepsType( StepsType st ) const; + bool HasStepsTypeAndDifficulty( StepsType st, Difficulty dc ) const; const vector& GetAllSteps() const { return m_vpSteps; } void GetSteps( vector& arrayAddTo, StepsType st = 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 st, Difficulty dc, bool bIncludeAutoGen = true ) const;