more enum standardization

This commit is contained in:
Glenn Maynard
2006-10-07 04:39:48 +00:00
parent 2ce839e4eb
commit de6ca466d2
43 changed files with 110 additions and 108 deletions
+4 -4
View File
@@ -13,7 +13,7 @@
bool StepsCriteria::Matches( const Song *pSong, const Steps *pSteps ) const
{
if( m_difficulty != DIFFICULTY_Invalid && pSteps->GetDifficulty() != m_difficulty )
if( m_difficulty != Difficulty_Invalid && pSteps->GetDifficulty() != m_difficulty )
return false;
if( m_iLowMeter != -1 && pSteps->GetMeter() < m_iLowMeter )
return false;
@@ -191,7 +191,7 @@ void StepsID::FromSteps( const Steps *p )
if( p == NULL )
{
st = StepsType_Invalid;
dc = DIFFICULTY_Invalid;
dc = Difficulty_Invalid;
sDescription = "";
uHash = 0;
}
@@ -225,7 +225,7 @@ static map<SongIDAndStepsID,Steps *> g_Cache;
Steps *StepsID::ToSteps( const Song *p, bool bAllowNull, bool bUseCache ) const
{
if( st == StepsType_Invalid || dc == DIFFICULTY_Invalid )
if( st == StepsType_Invalid || dc == Difficulty_Invalid )
return NULL;
SongID songID;
@@ -317,7 +317,7 @@ RString StepsID::ToString() const
bool StepsID::IsValid() const
{
return st != StepsType_Invalid && dc != DIFFICULTY_Invalid;
return st != StepsType_Invalid && dc != Difficulty_Invalid;
}
bool StepsID::operator<( const StepsID &rhs ) const