diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp index 7be5be1c12..c970ee222b 100644 --- a/stepmania/src/CommonMetrics.cpp +++ b/stepmania/src/CommonMetrics.cpp @@ -94,7 +94,7 @@ static void RemoveStepsTypes( vector& inout, RString sStepsTypesToRem FOREACH_CONST( RString, v, i ) { StepsType st = GameManager::StringToStepsType(*i); - if( st == STEPS_TYPE_INVALID ) + if( st == StepsType_Invalid ) LOG->Warn( "Invalid StepsType value '%s' in '%s'", i->c_str(), sStepsTypesToRemove.c_str() ); const vector::iterator iter = find( inout.begin(), inout.end(), st ); diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index 4aa572ac80..12f0347d1e 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -43,7 +43,7 @@ static void LuaStepsType(lua_State* L) s.Replace('-','_'); LUA->SetGlobal( "STEPS_TYPE_"+s, st ); } - LUA->SetGlobal( "STEPS_TYPE_INVALID", STEPS_TYPE_INVALID ); + LUA->SetGlobal( "STEPS_TYPE_INVALID", StepsType_Invalid ); } REGISTER_WITH_LUA_FUNCTION( LuaStepsType ); diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 826680b362..3126955f6b 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -70,7 +70,7 @@ enum StepsType STEPS_TYPE_POPN_NINE, STEPS_TYPE_LIGHTS_CABINET, NUM_StepsType, // leave this at the end - STEPS_TYPE_INVALID, + StepsType_Invalid, }; #define FOREACH_StepsType( st ) FOREACH_ENUM( StepsType, NUM_StepsType, st ) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 8edcdf640d..9fdd25383b 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -282,9 +282,9 @@ void GameState::Reset() LIGHTSMAN->SetLightsMode( LIGHTSMODE_ATTRACT ); - m_stEdit.Set( STEPS_TYPE_INVALID ); + m_stEdit.Set( StepsType_Invalid ); m_pEditSourceSteps.Set( NULL ); - m_stEditSource.Set( STEPS_TYPE_INVALID ); + m_stEditSource.Set( StepsType_Invalid ); m_iEditCourseEntryIndex.Set( -1 ); m_sEditLocalProfileID.Set( "" ); diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp index 10ba2141fd..2bd134940b 100644 --- a/stepmania/src/NotesLoaderBMS.cpp +++ b/stepmania/src/NotesLoaderBMS.cpp @@ -180,7 +180,7 @@ static StepsType DetermineStepsType( int iPlayer, const NoteData &nd, const RStr return STEPS_TYPE_BEAT_SINGLE5; case 8: return STEPS_TYPE_BEAT_SINGLE7; case 9: return STEPS_TYPE_POPN_NINE; - default: return STEPS_TYPE_INVALID; + default: return StepsType_Invalid; } case 2: // couple/battle return STEPS_TYPE_DANCE_COUPLE; @@ -194,11 +194,11 @@ static StepsType DetermineStepsType( int iPlayer, const NoteData &nd, const RStr case 8: return STEPS_TYPE_BEAT_SINGLE7; case 12: return STEPS_TYPE_BEAT_DOUBLE5; case 16: return STEPS_TYPE_BEAT_DOUBLE7; - default: return STEPS_TYPE_INVALID; + default: return StepsType_Invalid; } default: LOG->UserLog( "Song file", sPath, "has an invalid #PLAYER value %d.", iPlayer ); - return STEPS_TYPE_INVALID; + return StepsType_Invalid; } } @@ -252,7 +252,7 @@ bool BMSLoader::LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNa { LOG->Trace( "Steps::LoadFromBMSFile( '%s' )", sPath.c_str() ); - out.m_StepsType = STEPS_TYPE_INVALID; + out.m_StepsType = StepsType_Invalid; // BMS player code. Fill in below and use to determine StepsType. int iPlayer = -1; @@ -408,7 +408,7 @@ bool BMSLoader::LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNa out.m_StepsType = STEPS_TYPE_DANCE_SOLO; } - if( out.m_StepsType == STEPS_TYPE_INVALID ) + if( out.m_StepsType == StepsType_Invalid ) { LOG->UserLog( "Song file", sPath, "has an unknown steps type" ); return false; diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp index 7298e88f98..3a891bb63b 100644 --- a/stepmania/src/NotesLoaderDWI.cpp +++ b/stepmania/src/NotesLoaderDWI.cpp @@ -124,7 +124,7 @@ bool DWILoader::LoadFromDWITokens( { CHECKPOINT_M( "DWILoader::LoadFromDWITokens()" ); - out.m_StepsType = STEPS_TYPE_INVALID; + out.m_StepsType = StepsType_Invalid; if( sMode == "SINGLE" ) out.m_StepsType = STEPS_TYPE_DANCE_SINGLE; else if( sMode == "DOUBLE" ) out.m_StepsType = STEPS_TYPE_DANCE_DOUBLE; @@ -513,7 +513,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out ) (iNumParams==5) ? sParams[4] : RString(""), *pNewNotes ); - if(pNewNotes->m_StepsType != STEPS_TYPE_INVALID) + if( pNewNotes->m_StepsType != StepsType_Invalid ) out.AddSteps( pNewNotes ); else delete pNewNotes; diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index ac6ee01f7a..a41149dd56 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -1160,7 +1160,7 @@ public: m_Def.m_vsChoices.push_back( s ); } - if( *m_pstToFill == STEPS_TYPE_INVALID ) + if( *m_pstToFill == StepsType_Invalid ) m_pstToFill->Set( m_vStepsTypesToShow[0] ); } diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index ce320a187f..4bb1aee379 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -1525,7 +1525,7 @@ void Profile::LoadCategoryScoresFromNode( const XNode* pCategoryScores ) if( !pStepsType->GetAttrValue( "Type", str ) ) WARN_AND_CONTINUE; StepsType st = GameManager::StringToStepsType( str ); - if( st == STEPS_TYPE_INVALID ) + if( st == StepsType_Invalid ) WARN_AND_CONTINUE_M( str ); FOREACH_CONST_Child( pStepsType, pRadarCategory ) @@ -1822,7 +1822,7 @@ void Profile::AddCourseRecentScore( const Course* pCourse, const Trail* pTrail, StepsType Profile::GetLastPlayedStepsType() const { if( m_vRecentStepsScores.empty() ) - return STEPS_TYPE_INVALID; + return StepsType_Invalid; const HighScoreForASongAndSteps &h = m_vRecentStepsScores.back(); return h.stepsID.GetStepsType(); } diff --git a/stepmania/src/ScreenOptionsEditCourseEntry.cpp b/stepmania/src/ScreenOptionsEditCourseEntry.cpp index bb1efc5770..5089b8f4ca 100644 --- a/stepmania/src/ScreenOptionsEditCourseEntry.cpp +++ b/stepmania/src/ScreenOptionsEditCourseEntry.cpp @@ -278,9 +278,9 @@ void ScreenOptionsEditCourseEntry::HandleScreenMessage( const ScreenMessage SM ) if( !pSteps ) pSteps = SongUtil::GetStepsByDifficulty( pSong, st, DIFFICULTY_INVALID, false ); if( !pSteps ) - pSteps = SongUtil::GetStepsByDifficulty( pSong, STEPS_TYPE_INVALID, cd, false ); + pSteps = SongUtil::GetStepsByDifficulty( pSong, StepsType_Invalid, cd, false ); if( !pSteps ) - pSteps = SongUtil::GetStepsByDifficulty( pSong, STEPS_TYPE_INVALID, DIFFICULTY_INVALID, false ); + pSteps = SongUtil::GetStepsByDifficulty( pSong, StepsType_Invalid, DIFFICULTY_INVALID, false ); ASSERT( pSteps ); // Set up for ScreenEdit diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp index 327a93649c..8968236098 100644 --- a/stepmania/src/ScreenOptionsManageCourses.cpp +++ b/stepmania/src/ScreenOptionsManageCourses.cpp @@ -167,7 +167,7 @@ void ScreenOptionsManageCourses::Init() void ScreenOptionsManageCourses::BeginScreen() { - if( GAMESTATE->m_stEdit == STEPS_TYPE_INVALID || + if( GAMESTATE->m_stEdit == StepsType_Invalid || GAMESTATE->m_cdEdit == DIFFICULTY_INVALID ) { SetNextCombination(); diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp index 63faf7ef90..2cb858f69a 100644 --- a/stepmania/src/SongUtil.cpp +++ b/stepmania/src/SongUtil.cpp @@ -99,7 +99,7 @@ void SongUtil::GetSteps( if( !iMaxToGet ) return; - const vector &vpSteps = st == STEPS_TYPE_INVALID ? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); + const vector &vpSteps = st == StepsType_Invalid ? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); for( unsigned i=0; i& vpSteps = (st == STEPS_TYPE_INVALID)? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); + const vector& vpSteps = (st == StepsType_Invalid)? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); for( unsigned i=0; i& vpSteps = (st == STEPS_TYPE_INVALID)? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); + const vector& vpSteps = (st == StepsType_Invalid)? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); for( unsigned i=0; i& vpSteps = (st == STEPS_TYPE_INVALID)? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); + const vector& vpSteps = (st == StepsType_Invalid)? pSong->GetAllSteps() : pSong->GetStepsByStepsType(st); Steps *pClosest = NULL; int iClosestDistance = 999; for( unsigned i=0; i v; - GetSteps( pSong, v, STEPS_TYPE_INVALID, DIFFICULTY_EDIT ); + GetSteps( pSong, v, StepsType_Invalid, DIFFICULTY_EDIT ); FOREACH_CONST( Steps*, v, s ) { if( pSteps == *s ) diff --git a/stepmania/src/SongUtil.h b/stepmania/src/SongUtil.h index e4aa730677..54cf3a8de2 100644 --- a/stepmania/src/SongUtil.h +++ b/stepmania/src/SongUtil.h @@ -58,7 +58,7 @@ namespace SongUtil void GetSteps( const Song *pSong, vector& arrayAddTo, - StepsType st = STEPS_TYPE_INVALID, + StepsType st = StepsType_Invalid, Difficulty dc = DIFFICULTY_INVALID, int iMeterLow = -1, int iMeterHigh = -1, @@ -69,7 +69,7 @@ namespace SongUtil ); Steps* GetOneSteps( const Song *pSong, - StepsType st = STEPS_TYPE_INVALID, + StepsType st = StepsType_Invalid, Difficulty dc = DIFFICULTY_INVALID, int iMeterLow = -1, int iMeterHigh = -1, diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp index d3835200db..915280dfe5 100644 --- a/stepmania/src/Steps.cpp +++ b/stepmania/src/Steps.cpp @@ -29,7 +29,7 @@ Steps::Steps() { m_bSavedToDisk = false; - m_StepsType = STEPS_TYPE_INVALID; + m_StepsType = StepsType_Invalid; m_LoadedFromProfile = ProfileSlot_INVALID; m_iHash = 0; m_Difficulty = DIFFICULTY_INVALID; diff --git a/stepmania/src/StepsUtil.cpp b/stepmania/src/StepsUtil.cpp index f63add5287..f365fc884b 100644 --- a/stepmania/src/StepsUtil.cpp +++ b/stepmania/src/StepsUtil.cpp @@ -19,7 +19,7 @@ bool StepsCriteria::Matches( const Song *pSong, const Steps *pSteps ) const return false; if( m_iHighMeter != -1 && pSteps->GetMeter() > m_iHighMeter ) return false; - if( m_st != STEPS_TYPE_INVALID && pSteps->m_StepsType != m_st ) + if( m_st != StepsType_Invalid && pSteps->m_StepsType != m_st ) return false; switch( m_Locked ) { @@ -51,7 +51,7 @@ void StepsUtil::GetAllMatching( const SongCriteria &soc, const StepsCriteria &st void StepsUtil::GetAllMatching( Song *pSong, const StepsCriteria &stc, vector &out ) { - const vector &vSteps = ( stc.m_st == STEPS_TYPE_INVALID ? pSong->GetAllSteps() : + const vector &vSteps = ( stc.m_st == StepsType_Invalid ? pSong->GetAllSteps() : pSong->GetStepsByStepsType(stc.m_st) ); FOREACH_CONST( Steps*, vSteps, st ) @@ -190,7 +190,7 @@ void StepsID::FromSteps( const Steps *p ) { if( p == NULL ) { - st = STEPS_TYPE_INVALID; + st = StepsType_Invalid; dc = DIFFICULTY_INVALID; sDescription = ""; uHash = 0; @@ -225,7 +225,7 @@ static map g_Cache; Steps *StepsID::ToSteps( const Song *p, bool bAllowNull, bool bUseCache ) const { - if( st == STEPS_TYPE_INVALID || dc == DIFFICULTY_INVALID ) + if( st == StepsType_Invalid || dc == DIFFICULTY_INVALID ) return NULL; SongID songID; @@ -318,7 +318,7 @@ RString StepsID::ToString() const bool StepsID::IsValid() const { - return st != STEPS_TYPE_INVALID && dc != DIFFICULTY_INVALID; + return st != StepsType_Invalid && dc != DIFFICULTY_INVALID; } bool StepsID::operator<( const StepsID &rhs ) const diff --git a/stepmania/src/StepsUtil.h b/stepmania/src/StepsUtil.h index 6ed7212ac4..ac7aa44683 100644 --- a/stepmania/src/StepsUtil.h +++ b/stepmania/src/StepsUtil.h @@ -16,7 +16,7 @@ public: Difficulty m_difficulty; // don't filter if DIFFICULTY_INVALID int m_iLowMeter; // don't filter if -1 int m_iHighMeter; // don't filter if -1 - StepsType m_st; // don't filter if STEPS_TYPE_INVALID + StepsType m_st; // don't filter if StepsType_Invalid enum Locked { Locked_Locked, Locked_Unlocked, Locked_DontCare } m_Locked; StepsCriteria() @@ -24,7 +24,7 @@ public: m_difficulty = DIFFICULTY_INVALID; m_iLowMeter = -1; m_iHighMeter = -1; - m_st = STEPS_TYPE_INVALID; + m_st = StepsType_Invalid; m_Locked = Locked_DontCare; } diff --git a/stepmania/src/Trail.h b/stepmania/src/Trail.h index 2c2daaeff5..3cc9c199fd 100644 --- a/stepmania/src/Trail.h +++ b/stepmania/src/Trail.h @@ -56,7 +56,7 @@ public: } void Init() { - m_StepsType = STEPS_TYPE_INVALID; + m_StepsType = StepsType_Invalid; m_CourseDifficulty = DIFFICULTY_INVALID; m_iSpecifiedMeter = -1; m_vEntries.clear(); diff --git a/stepmania/src/TrailUtil.cpp b/stepmania/src/TrailUtil.cpp index 58540183de..bd97d1981e 100644 --- a/stepmania/src/TrailUtil.cpp +++ b/stepmania/src/TrailUtil.cpp @@ -10,7 +10,7 @@ void TrailID::FromTrail( const Trail *p ) { if( p == NULL ) { - st = STEPS_TYPE_INVALID; + st = StepsType_Invalid; cd = DIFFICULTY_INVALID; } else @@ -24,7 +24,7 @@ Trail *TrailID::ToTrail( const Course *p, bool bAllowNull ) const { ASSERT( p ); - if( st == STEPS_TYPE_INVALID || cd == DIFFICULTY_INVALID ) + if( st == StepsType_Invalid || cd == DIFFICULTY_INVALID ) return NULL; Trail *ret = p->GetTrail( st, cd ); @@ -67,7 +67,7 @@ RString TrailID::ToString() const bool TrailID::IsValid() const { - return st != STEPS_TYPE_INVALID && cd != DIFFICULTY_INVALID; + return st != StepsType_Invalid && cd != DIFFICULTY_INVALID; } bool TrailID::operator<( const TrailID &rhs ) const diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp index 2a2fbaa3cb..2c5dc559df 100644 --- a/stepmania/src/UnlockManager.cpp +++ b/stepmania/src/UnlockManager.cpp @@ -326,7 +326,7 @@ UnlockEntryStatus UnlockEntry::GetUnlockEntryStatus() const SongUtil::GetSteps( m_pSong, vp, - STEPS_TYPE_INVALID, + StepsType_Invalid, DIFFICULTY_HARD ); FOREACH_CONST( Steps*, vp, s ) @@ -469,11 +469,11 @@ void UnlockManager::Load() FOREACH_CONST( Song*, SONGMAN->GetAllSongs(), s ) { // If no hard steps to play to unlock, skip - if( SongUtil::GetOneSteps(*s, STEPS_TYPE_INVALID, DIFFICULTY_HARD) == NULL ) + if( SongUtil::GetOneSteps(*s, StepsType_Invalid, DIFFICULTY_HARD) == NULL ) continue; // If no challenge steps to unlock, skip - if( SongUtil::GetOneSteps(*s, STEPS_TYPE_INVALID, DIFFICULTY_CHALLENGE) == NULL ) + if( SongUtil::GetOneSteps(*s, StepsType_Invalid, DIFFICULTY_CHALLENGE) == NULL ) continue; if( SONGMAN->WasLoadedFromAdditionalSongs(*s) )