diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index ac0ca98581..3185b403ca 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -21,7 +21,7 @@ static const CString RadarCategoryNames[] = { "Air", "Freeze", "Chaos", - "Taps", + "TapsAndHolds", "Jumps", "Holds", "Mines", @@ -37,8 +37,7 @@ static void LuaRadarCategory(lua_State* L) FOREACH_RadarCategory( rc ) { CString s = RadarCategoryToString( rc ); - s.MakeUpper(); - LUA->SetGlobal( "RADAR_CATEGORY_"+s, rc ); + LUA->SetGlobal( "RadarCategory_"+s, rc ); } } REGISTER_WITH_LUA_FUNCTION( LuaRadarCategory ); diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 510c02b8d5..d715d8c7b8 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -18,17 +18,17 @@ const int MIN_METER = 1; * in the radar. */ enum RadarCategory { - RADAR_STREAM = 0, - RADAR_VOLTAGE, - RADAR_AIR, - RADAR_FREEZE, - RADAR_CHAOS, - RADAR_NUM_TAPS_AND_HOLDS, - RADAR_NUM_JUMPS, - RADAR_NUM_HOLDS, - RADAR_NUM_MINES, - RADAR_NUM_HANDS, - RADAR_NUM_ROLLS, + RadarCategory_Stream = 0, + RadarCategory_Voltage, + RadarCategory_Air, + RadarCategory_Freeze, + RadarCategory_Chaos, + RadarCategory_TapsAndHolds, + RadarCategory_Jumps, + RadarCategory_Holds, + RadarCategory_Mines, + RadarCategory_Hands, + RadarCategory_Rolls, NUM_RADAR_CATEGORIES // leave this at the end }; #define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, NUM_RADAR_CATEGORIES, rc ) diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index a46ac89a17..81b75e1316 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -580,17 +580,17 @@ void NoteDataUtil::CalculateRadarValues( const NoteData &in, float fSongSeconds, { switch( rc ) { - case RADAR_STREAM: out[rc] = GetStreamRadarValue( in, fSongSeconds ); break; - case RADAR_VOLTAGE: out[rc] = GetVoltageRadarValue( in, fSongSeconds ); break; - case RADAR_AIR: out[rc] = GetAirRadarValue( in, fSongSeconds ); break; - case RADAR_FREEZE: out[rc] = GetFreezeRadarValue( in, fSongSeconds ); break; - case RADAR_CHAOS: out[rc] = GetChaosRadarValue( in, fSongSeconds ); break; - case RADAR_NUM_TAPS_AND_HOLDS: out[rc] = (float) in.GetNumRowsWithTapOrHoldHead(); break; - case RADAR_NUM_JUMPS: out[rc] = (float) in.GetNumJumps(); break; - case RADAR_NUM_HOLDS: out[rc] = (float) in.GetNumHoldNotes(); break; - case RADAR_NUM_MINES: out[rc] = (float) in.GetNumMines(); break; - case RADAR_NUM_HANDS: out[rc] = (float) in.GetNumHands(); break; - case RADAR_NUM_ROLLS: out[rc] = (float) in.GetNumRolls(); break; + case RadarCategory_Stream: out[rc] = GetStreamRadarValue( in, fSongSeconds ); break; + case RadarCategory_Voltage: out[rc] = GetVoltageRadarValue( in, fSongSeconds ); break; + case RadarCategory_Air: out[rc] = GetAirRadarValue( in, fSongSeconds ); break; + case RadarCategory_Freeze: out[rc] = GetFreezeRadarValue( in, fSongSeconds ); break; + case RadarCategory_Chaos: out[rc] = GetChaosRadarValue( in, fSongSeconds ); break; + case RadarCategory_TapsAndHolds: out[rc] = (float) in.GetNumRowsWithTapOrHoldHead(); break; + case RadarCategory_Jumps: out[rc] = (float) in.GetNumJumps(); break; + case RadarCategory_Holds: out[rc] = (float) in.GetNumHoldNotes(); break; + case RadarCategory_Mines: out[rc] = (float) in.GetNumMines(); break; + case RadarCategory_Hands: out[rc] = (float) in.GetNumHands(); break; + case RadarCategory_Rolls: out[rc] = (float) in.GetNumRolls(); break; default: ASSERT(0); } } diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp index 87bc7e8aa6..8de05867e2 100644 --- a/stepmania/src/NoteDataWithScoring.cpp +++ b/stepmania/src/NoteDataWithScoring.cpp @@ -263,17 +263,17 @@ void NoteDataWithScoring::GetActualRadarValues( const NoteData &in, PlayerNumber { switch( rc ) { - case RADAR_STREAM: out[rc] = GetActualStreamRadarValue( in, fSongSeconds, pn ); break; - case RADAR_VOLTAGE: out[rc] = GetActualVoltageRadarValue( in, fSongSeconds, pn ); break; - case RADAR_AIR: out[rc] = GetActualAirRadarValue( in, fSongSeconds, pn ); break; - case RADAR_FREEZE: out[rc] = GetActualFreezeRadarValue( in, fSongSeconds, pn ); break; - case RADAR_CHAOS: out[rc] = GetActualChaosRadarValue( in, fSongSeconds, pn ); break; - case RADAR_NUM_TAPS_AND_HOLDS: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 1 ); break; - case RADAR_NUM_JUMPS: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 2 ); break; - case RADAR_NUM_HOLDS: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_hold, HNS_Held ); break; - case RADAR_NUM_MINES: out[rc] = (float) GetSuccessfulMines( in ); break; - case RADAR_NUM_HANDS: out[rc] = (float) GetSuccessfulHands( in ); break; - case RADAR_NUM_ROLLS: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_roll, HNS_Held ); break; + case RadarCategory_Stream: out[rc] = GetActualStreamRadarValue( in, fSongSeconds, pn ); break; + case RadarCategory_Voltage: out[rc] = GetActualVoltageRadarValue( in, fSongSeconds, pn ); break; + case RadarCategory_Air: out[rc] = GetActualAirRadarValue( in, fSongSeconds, pn ); break; + case RadarCategory_Freeze: out[rc] = GetActualFreezeRadarValue( in, fSongSeconds, pn ); break; + case RadarCategory_Chaos: out[rc] = GetActualChaosRadarValue( in, fSongSeconds, pn ); break; + case RadarCategory_TapsAndHolds: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 1 ); break; + case RadarCategory_Jumps: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 2 ); break; + case RadarCategory_Holds: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_hold, HNS_Held ); break; + case RadarCategory_Mines: out[rc] = (float) GetSuccessfulMines( in ); break; + case RadarCategory_Hands: out[rc] = (float) GetSuccessfulHands( in ); break; + case RadarCategory_Rolls: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_roll, HNS_Held ); break; default: ASSERT(0); } } diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp index 8b0ccd7618..686a7cb3f9 100644 --- a/stepmania/src/PaneDisplay.cpp +++ b/stepmania/src/PaneDisplay.cpp @@ -152,17 +152,17 @@ void PaneDisplay::SetContent( PaneContents c ) switch( c ) { case COURSE_NUM_STEPS: - case SONG_NUM_STEPS: val = rv[RADAR_NUM_TAPS_AND_HOLDS]; break; + case SONG_NUM_STEPS: val = rv[RadarCategory_TapsAndHolds]; break; case COURSE_JUMPS: - case SONG_JUMPS: val = rv[RADAR_NUM_JUMPS]; break; + case SONG_JUMPS: val = rv[RadarCategory_Jumps]; break; case COURSE_HOLDS: - case SONG_HOLDS: val = rv[RADAR_NUM_HOLDS]; break; + case SONG_HOLDS: val = rv[RadarCategory_Holds]; break; case COURSE_ROLLS: - case SONG_ROLLS: val = rv[RADAR_NUM_ROLLS]; break; + case SONG_ROLLS: val = rv[RadarCategory_Rolls]; break; case COURSE_MINES: - case SONG_MINES: val = rv[RADAR_NUM_MINES]; break; + case SONG_MINES: val = rv[RadarCategory_Mines]; break; case COURSE_HANDS: - case SONG_HANDS: val = rv[RADAR_NUM_HANDS]; break; + case SONG_HANDS: val = rv[RadarCategory_Hands]; break; case SONG_PROFILE_HIGH_SCORE: val = PROFILEMAN->GetProfile(m_PlayerNumber)->GetStepsHighScoreList(pSong,pSteps).GetTopScore().GetPercentDP(); break; diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index 97b4a44932..59258f91c9 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -575,17 +575,17 @@ bool PlayerOptions::IsEasierForSongAndSteps( Song* pSong, Steps* pSteps ) { if( m_fTimeSpacing && pSong->HasSignificantBpmChangesOrStops() ) return true; - if( m_bTransforms[TRANSFORM_NOHOLDS] && pSteps->GetRadarValues()[RADAR_NUM_HOLDS]>0 ) + if( m_bTransforms[TRANSFORM_NOHOLDS] && pSteps->GetRadarValues()[RadarCategory_Holds]>0 ) return true; - if( m_bTransforms[TRANSFORM_NOROLLS] && pSteps->GetRadarValues()[RADAR_NUM_ROLLS]>0 ) + if( m_bTransforms[TRANSFORM_NOROLLS] && pSteps->GetRadarValues()[RadarCategory_Rolls]>0 ) return true; - if( m_bTransforms[TRANSFORM_NOMINES] && pSteps->GetRadarValues()[RADAR_NUM_MINES]>0 ) + if( m_bTransforms[TRANSFORM_NOMINES] && pSteps->GetRadarValues()[RadarCategory_Mines]>0 ) return true; - if( m_bTransforms[TRANSFORM_NOHANDS] && pSteps->GetRadarValues()[RADAR_NUM_HANDS]>0 ) + if( m_bTransforms[TRANSFORM_NOHANDS] && pSteps->GetRadarValues()[RadarCategory_Hands]>0 ) return true; - if( m_bTransforms[TRANSFORM_NOQUADS] && pSteps->GetRadarValues()[RADAR_NUM_HANDS]>0 ) + if( m_bTransforms[TRANSFORM_NOQUADS] && pSteps->GetRadarValues()[RadarCategory_Hands]>0 ) return true; - if( m_bTransforms[TRANSFORM_NOJUMPS] && pSteps->GetRadarValues()[RADAR_NUM_JUMPS]>0 ) + if( m_bTransforms[TRANSFORM_NOJUMPS] && pSteps->GetRadarValues()[RadarCategory_Jumps]>0 ) return true; if( m_bTransforms[TRANSFORM_NOSTRETCH] ) return true; diff --git a/stepmania/src/RadarValues.cpp b/stepmania/src/RadarValues.cpp index 5969f95270..a650998e8c 100644 --- a/stepmania/src/RadarValues.cpp +++ b/stepmania/src/RadarValues.cpp @@ -33,7 +33,7 @@ XNode* RadarValues::CreateNode() const // TRICKY: Don't print a remainder for the integer values. FOREACH_RadarCategory( rc ) { - if( rc >= RADAR_NUM_TAPS_AND_HOLDS ) + if( rc >= RadarCategory_TapsAndHolds ) { if( WRITE_SIMPLE_VALUES ) pNode->AppendChild( RadarCategoryToString(rc), (int)m_Values.f[rc] ); diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp index 1c602e9924..2741bfa32c 100644 --- a/stepmania/src/ScoreKeeperNormal.cpp +++ b/stepmania/src/ScoreKeeperNormal.cpp @@ -444,9 +444,9 @@ int ScoreKeeperNormal::GetPossibleDancePoints( const RadarValues& radars ) /* Note that, if W1 timing is disabled or not active (not course mode), * W2 will be used instead. */ - int NumTaps = int(radars[RADAR_NUM_TAPS_AND_HOLDS]); - int NumHolds = int(radars[RADAR_NUM_HOLDS]); - int NumRolls = int(radars[RADAR_NUM_ROLLS]); + int NumTaps = int(radars[RadarCategory_TapsAndHolds]); + int NumHolds = int(radars[RadarCategory_Holds]); + int NumRolls = int(radars[RadarCategory_Rolls]); return NumTaps*TapNoteScoreToDancePoints(TNS_W1, false)+ NumHolds*HoldNoteScoreToDancePoints(HNS_Held, false) + @@ -469,9 +469,9 @@ int ScoreKeeperNormal::GetPossibleGradePoints( const RadarValues& radars ) /* Note that, if W1 timing is disabled or not active (not course mode), * W2 will be used instead. */ - int NumTaps = int(radars[RADAR_NUM_TAPS_AND_HOLDS]); - int NumHolds = int(radars[RADAR_NUM_HOLDS]); - int NumRolls = int(radars[RADAR_NUM_ROLLS]); + int NumTaps = int(radars[RadarCategory_TapsAndHolds]); + int NumHolds = int(radars[RadarCategory_Holds]); + int NumRolls = int(radars[RadarCategory_Rolls]); return NumTaps*TapNoteScoreToGradePoints(TNS_W1, false)+ NumHolds*HoldNoteScoreToGradePoints(HNS_Held, false) + diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 80ca76e59a..80cea37f5f 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -540,7 +540,7 @@ void ScreenEvaluation::Init() static const int indeces[NUM_StatLine] = { - RADAR_NUM_JUMPS, RADAR_NUM_HOLDS, RADAR_NUM_MINES, RADAR_NUM_HANDS, RADAR_NUM_ROLLS + RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls }; const int ind = indeces[l]; const int iActual = (int) roundf(STATSMAN->m_CurStageStats.m_player[p].radarActual[ind]); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 2c4bbec0e8..118930f6e4 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -2239,8 +2239,8 @@ void ScreenGameplay::SongFinished() // save any statistics FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) { - /* Note that adding stats is only meaningful for the counters (eg. RADAR_NUM_JUMPS), - * not for the percentages (RADAR_AIR). */ + /* Note that adding stats is only meaningful for the counters (eg. RadarCategory_Jumps), + * not for the percentages (RadarCategory_Air). */ RadarValues v; NoteDataUtil::CalculateRadarValues( pi->m_pPlayer->m_NoteData, GAMESTATE->m_pCurSong->m_fMusicLengthSeconds, v ); diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp index 19cbbc6225..e56a504831 100644 --- a/stepmania/src/SongUtil.cpp +++ b/stepmania/src/SongUtil.cpp @@ -362,7 +362,7 @@ void SongUtil::SortSongPointerArrayByMeter( vector &vpSongsInOut, Difficu s += ssprintf( "%c", (pSteps? pSteps->GetDifficulty():0) + '0' ); if( PREFSMAN->m_bSubSortByNumSteps ) - s += ssprintf("%06.0f",pSteps ? pSteps->GetRadarValues()[RADAR_NUM_TAPS_AND_HOLDS] : 0); + s += ssprintf("%06.0f",pSteps ? pSteps->GetRadarValues()[RadarCategory_TapsAndHolds] : 0); } stable_sort( vpSongsInOut.begin(), vpSongsInOut.end(), CompareSongPointersBySortValueAscending ); } diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index c43ccdaa46..6753ab0670 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -42,13 +42,13 @@ static StageStats AccumStageStats( const vector& vss ) if( uNumSongs == 0 ) return ssreturn; // don't divide by 0 below - /* Scale radar percentages back down to roughly 0..1. Don't scale RADAR_NUM_TAPS_AND_HOLDS + /* Scale radar percentages back down to roughly 0..1. Don't scale RadarCategory_TapsAndHolds * and the rest, which are counters. */ // FIXME: Weight each song by the number of stages it took to account for // long, marathon. FOREACH_EnabledPlayer( p ) { - for( int r = 0; r < RADAR_NUM_TAPS_AND_HOLDS; r++) + for( int r = 0; r < RadarCategory_TapsAndHolds; r++) { ssreturn.m_player[p].radarPossible[r] /= uNumSongs; ssreturn.m_player[p].radarActual[r] /= uNumSongs; @@ -56,7 +56,7 @@ static StageStats AccumStageStats( const vector& vss ) } FOREACH_EnabledMultiPlayer( p ) { - for( int r = 0; r < RADAR_NUM_TAPS_AND_HOLDS; r++) + for( int r = 0; r < RadarCategory_TapsAndHolds; r++) { ssreturn.m_multiPlayer[p].radarPossible[r] /= uNumSongs; ssreturn.m_multiPlayer[p].radarActual[r] /= uNumSongs; @@ -151,12 +151,12 @@ void StatsManager::CommitStatsToProfiles() // FOREACH_HumanPlayer( pn ) { - int iNumTapsAndHolds = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_TAPS_AND_HOLDS]; - int iNumJumps = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_JUMPS]; - int iNumHolds = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_HOLDS]; - int iNumRolls = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_ROLLS]; - int iNumMines = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_MINES]; - int iNumHands = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_HANDS]; + int iNumTapsAndHolds = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_TapsAndHolds]; + int iNumJumps = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Jumps]; + int iNumHolds = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Holds]; + int iNumRolls = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Rolls]; + int iNumMines = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Mines]; + int iNumHands = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Hands]; float fCaloriesBurned = m_CurStageStats.m_player[pn].fCaloriesBurned; PROFILEMAN->AddStepTotals( pn, iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned ); } diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp index 4738130f99..4d9ac9575e 100644 --- a/stepmania/src/Steps.cpp +++ b/stepmania/src/Steps.cpp @@ -119,8 +119,8 @@ float Steps::PredictMeter() const pMeter += DifficultyCoeffs[this->GetDifficulty()]; // Init non-radar values - const float SV = this->GetRadarValues()[RADAR_STREAM] * this->GetRadarValues()[RADAR_VOLTAGE]; - const float ChaosSquare = this->GetRadarValues()[RADAR_CHAOS] * this->GetRadarValues()[RADAR_CHAOS]; + const float SV = this->GetRadarValues()[RadarCategory_Stream] * this->GetRadarValues()[RadarCategory_Voltage]; + const float ChaosSquare = this->GetRadarValues()[RadarCategory_Chaos] * this->GetRadarValues()[RadarCategory_Chaos]; pMeter += -6.35f * SV; pMeter += -2.58f * ChaosSquare; if (pMeter < 1) pMeter = 1; diff --git a/stepmania/src/StepsUtil.cpp b/stepmania/src/StepsUtil.cpp index db24128b1b..e8aa9dc95b 100644 --- a/stepmania/src/StepsUtil.cpp +++ b/stepmania/src/StepsUtil.cpp @@ -71,8 +71,8 @@ bool StepsUtil::CompareNotesPointersByRadarValues(const Steps* pSteps1, const St float fScore1 = 0; float fScore2 = 0; - fScore1 += pSteps1->GetRadarValues()[RADAR_NUM_TAPS_AND_HOLDS]; - fScore2 += pSteps2->GetRadarValues()[RADAR_NUM_TAPS_AND_HOLDS]; + fScore1 += pSteps1->GetRadarValues()[RadarCategory_TapsAndHolds]; + fScore2 += pSteps2->GetRadarValues()[RadarCategory_TapsAndHolds]; return fScore1 < fScore2; }