actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

name cleanup

Browse Source
This commit is contained in:
Chris Danford
2004-06-02 05:52:16 +00:00
parent 6c692d953d
commit 0a5d0fb73f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DifficultyDisplay.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ void DifficultyDisplay::SetDifficulties( const Song* pSong, StepsType curType )
{ {
for( int diff = DIFFICULTY_BEGINNER; diff <= DIFFICULTY_CHALLENGE; ++diff ) 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 ); m_difficulty[diff].Command( ICONONCOMMAND );
else else
m_difficulty[diff].Command( ICONOFFCOMMAND ); m_difficulty[diff].Command( ICONOFFCOMMAND );
stepmania/src/MusicWheel.cpp
+1 -1
View File
@@ -1527,7 +1527,7 @@ Song* MusicWheel::GetSelectedSong()
{ {
Song* pSong = m_CurWheelItemData[iSelection]->m_pSong; Song* pSong = m_CurWheelItemData[iSelection]->m_pSong;
FOREACH( Difficulty, vDifficultiesToRequire, d ) FOREACH( Difficulty, vDifficultiesToRequire, d )
if( !pSong->SongHasNotesTypeAndDifficulty(st,*d) ) if( !pSong->HasStepsTypeAndDifficulty(st,*d) )
goto skip_song; goto skip_song;
return pSong; return pSong;
} }
stepmania/src/Song.cpp
+3 -3
View File
@@ -960,17 +960,17 @@ Steps* Song::GetClosestNotes( StepsType st, Difficulty dc ) const
/* Return whether the song is playable in the given style. */ /* Return whether the song is playable in the given style. */
bool Song::SongCompleteForStyle( const StyleDef *st ) const 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<Steps*> add; vector<Steps*> add;
GetSteps( add, st, DIFFICULTY_INVALID, -1, -1, "", true, 1 ); GetSteps( add, st, DIFFICULTY_INVALID, -1, -1, "", true, 1 );
return !add.empty(); return !add.empty();
} }
bool Song::SongHasNotesTypeAndDifficulty( StepsType st, Difficulty dc ) const bool Song::HasStepsTypeAndDifficulty( StepsType st, Difficulty dc ) const
{ {
vector<Steps*> add; vector<Steps*> add;
GetSteps( add, st, dc, -1, -1, "", true, 1 ); GetSteps( add, st, dc, -1, -1, "", true, 1 );
stepmania/src/song.h
+2 -2
View File
@@ -175,8 +175,8 @@ public:
vector<Steps*> m_vpSteps; vector<Steps*> m_vpSteps;
bool SongCompleteForStyle( const StyleDef *st ) const; bool SongCompleteForStyle( const StyleDef *st ) const;
bool SongHasNotesType( StepsType st ) const; bool HasStepsType( StepsType st ) const;
bool SongHasNotesTypeAndDifficulty( StepsType st, Difficulty dc ) const; bool HasStepsTypeAndDifficulty( StepsType st, Difficulty dc ) const;
const vector<Steps*>& GetAllSteps() const { return m_vpSteps; } const vector<Steps*>& GetAllSteps() const { return m_vpSteps; }
void GetSteps( vector<Steps*>& 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; void GetSteps( vector<Steps*>& 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; Steps* GetStepsByDifficulty( StepsType st, Difficulty dc, bool bIncludeAutoGen = true ) const;