diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index ff0121a290..445cdd46b3 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1225,7 +1225,6 @@ ShowW5=1 ShowMiss=1 ShowStatsLabels=1 ShowHeld=1 -ShowTotalError=0 ShowJumps=0 ShowHolds=0 ShowMines=0 @@ -2847,7 +2846,6 @@ HoldJudgmentYReverse=90 BrightGhostComboThreshold=100 StartDrawingAtPixels=-60 StopDrawingAtPixels=400 -MaxProTimingError=100 TapJudgmentsUnderField=0 HoldJudgmentsUnderField=0 diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index b7056651dd..3a2b6756f3 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -149,7 +149,6 @@ void Player::Init( HOLD_JUDGMENTS_UNDER_FIELD.Load(sType,"HoldJudgmentsUnderField"); START_DRAWING_AT_PIXELS.Load(sType,"StartDrawingAtPixels"); STOP_DRAWING_AT_PIXELS.Load(sType,"StopDrawingAtPixels"); - MAX_PRO_TIMING_ERROR.Load(sType,"MaxProTimingError"); if( m_pJudgment ) { @@ -702,11 +701,6 @@ void Player::Update( float fDeltaTime ) MESSAGEMAN->Broadcast( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_pPlayerState->m_mp) ); m_vHoldJudgment[iTrack]->SetHoldJudgment( hns ); - - int ms_error = (hns == HNS_Held)? 0:MAX_PRO_TIMING_ERROR; - - if( m_pPlayerStageStats ) - m_pPlayerStageStats->iTotalError += ms_error; } tn.HoldResult.fLife = fLife; @@ -1259,15 +1253,6 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld ) if( score != TNS_None ) tn.result.fTapNoteOffset = -fNoteOffset; - if( score != TNS_None && score != TNS_Miss ) - { - int ms_error = (int) roundf( fSecondsFromExact * 1000 ); - ms_error = min( ms_error, MAX_PRO_TIMING_ERROR.GetValue() ); - - if( m_pPlayerStageStats ) - m_pPlayerStageStats->iTotalError += ms_error; - } - //LOG->Trace("XXX: %i col %i, at %f, music at %f, step was at %f, off by %f", // score, col, fStepSeconds, fCurrentMusicSeconds, fMusicSeconds, fNoteOffset ); // LOG->Trace("Note offset: %f (fSecondsFromExact = %f), Score: %i", fNoteOffset, fSecondsFromExact, score); @@ -1471,8 +1456,6 @@ void Player::UpdateTapNotesMissedOlderThan( float fMissIfOlderThanSeconds ) // A normal note. Penalize for not stepping on it. MissedNoteOnThisRow = true; tn.result.tns = TNS_Miss; - if( m_pPlayerStageStats ) - m_pPlayerStageStats->iTotalError += MAX_PRO_TIMING_ERROR; } m_NoteData.SetTapNote( t, r, tn ); diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h index de82b6d704..230c642736 100644 --- a/stepmania/src/Player.h +++ b/stepmania/src/Player.h @@ -147,7 +147,6 @@ protected: ThemeMetric HOLD_JUDGMENTS_UNDER_FIELD; ThemeMetric START_DRAWING_AT_PIXELS; ThemeMetric STOP_DRAWING_AT_PIXELS; - ThemeMetric MAX_PRO_TIMING_ERROR; #define NUM_REVERSE 2 #define NUM_CENTERED 2 diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index 8ee2c52beb..4928bd7475 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -30,8 +30,6 @@ void PlayerStageStats::Init() iPossibleGradePoints = 0; iCurCombo = iMaxCombo = iCurMissCombo = iScore = iBonus = iMaxScore = iCurMaxScore = 0; iSongsPassed = iSongsPlayed = 0; - iTotalError = 0; - iTotalError = 0; fLifeRemainingSeconds = 0; fCaloriesBurned = 0; tnsLast = TNS_INVALID; @@ -81,7 +79,6 @@ void PlayerStageStats::AddStats( const PlayerStageStats& other ) radarActual += other.radarActual; iSongsPassed += other.iSongsPassed; iSongsPlayed += other.iSongsPlayed; - iTotalError += other.iTotalError; fCaloriesBurned += other.fCaloriesBurned; fLifeRemainingSeconds = other.fLifeRemainingSeconds; // don't accumulate diff --git a/stepmania/src/PlayerStageStats.h b/stepmania/src/PlayerStageStats.h index 5f402a9e74..47f6375fcf 100644 --- a/stepmania/src/PlayerStageStats.h +++ b/stepmania/src/PlayerStageStats.h @@ -56,7 +56,6 @@ public: /* The number of songs played and passed, respectively. */ int iSongsPassed; int iSongsPlayed; - int iTotalError; float fLifeRemainingSeconds; // used in survival // workout diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 84c940b84b..2d23a38830 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -40,7 +40,7 @@ const int NUM_SCORE_DIGITS = 9; #define BANNER_HEIGHT THEME->GetMetricF(m_sName,"BannerHeight") static const char *JudgeLineNames[] = { - "W1", "W2", "W3", "W4", "W5", "Miss", "Held", "MaxCombo", "TotalError" + "W1", "W2", "W3", "W4", "W5", "Miss", "Held", "MaxCombo" }; XToString( JudgeLine, NUM_JudgeLine ); #define FOREACH_JudgeLine( rc ) FOREACH_ENUM( JudgeLine, NUM_JudgeLine, rc ) @@ -195,8 +195,6 @@ void ScreenEvaluation::Init() m_bFailed = STATSMAN->m_CurStageStats.AllFailed(); - LOG->Trace( "total error: %i, %i", STATSMAN->m_CurStageStats.m_player[PLAYER_1].iTotalError, STATSMAN->m_CurStageStats.m_player[PLAYER_2].iTotalError ); - /* // // Debugging @@ -502,7 +500,6 @@ void ScreenEvaluation::Init() case JudgeLine_Miss: iValue = STATSMAN->m_CurStageStats.m_player[p].iTapNoteScores[TNS_Miss]; break; case JudgeLine_Held: iValue = STATSMAN->m_CurStageStats.m_player[p].iHoldNoteScores[HNS_Held]; break; case JudgeLine_MaxCombo: iValue = STATSMAN->m_CurStageStats.m_player[p].GetMaxCombo().cnt; break; - case JudgeLine_Error: iValue = STATSMAN->m_CurStageStats.m_player[p].iTotalError; break; default: iValue = 0; ASSERT(0); } diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index a5039b996b..94f6710ed3 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -26,7 +26,6 @@ enum JudgeLine JudgeLine_Miss, JudgeLine_Held, JudgeLine_MaxCombo, - JudgeLine_Error, NUM_JudgeLine }; enum StatLine