From 3331079cd626feaf622ec62ce583bb165173ae24 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 27 Oct 2003 22:24:33 +0000 Subject: [PATCH] show TotalError --- stepmania/src/ScreenEvaluation.cpp | 17 +++++++++++------ stepmania/src/ScreenEvaluation.h | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index b2b7a3edc9..1b799feac8 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -34,7 +34,10 @@ const int NUM_SCORE_DIGITS = 9; // metrics that are common to all ScreenEvaluation classes #define BANNER_WIDTH THEME->GetMetricF("ScreenEvaluation","BannerWidth") #define BANNER_HEIGHT THEME->GetMetricF("ScreenEvaluation","BannerHeight") -const char* JUDGE_STRING[NUM_JUDGE_LINES] = { "Marvelous", "Perfect", "Great", "Good", "Boo", "Miss", "OK", "MaxCombo" }; +const char* JUDGE_STRING[NUM_JUDGE_LINES] = +{ + "Marvelous", "Perfect", "Great", "Good", "Boo", "Miss", "OK", "MaxCombo", "TotalError" +}; #define SPIN_GRADES THEME->GetMetricB("ScreenEvaluation","SpinGrades") #define CHEER_DELAY_SECONDS THEME->GetMetricF("ScreenEvaluation","CheerDelaySeconds") #define BAR_ACTUAL_MAX_COMMAND THEME->GetMetric ("ScreenEvaluation","BarActualMaxCommand") @@ -70,13 +73,14 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) // // debugging // -/* GAMESTATE->m_PlayMode = PLAY_MODE_NONSTOP; + /* + GAMESTATE->m_PlayMode = PLAY_MODE_ARCADE; GAMESTATE->m_CurStyle = STYLE_DANCE_VERSUS; GAMESTATE->m_MasterPlayerNumber = PLAYER_1; GAMESTATE->m_pCurSong = SONGMAN->GetAllSongs()[0]; - GAMESTATE->m_pCurCourse = SONGMAN->m_pCourses[0]; - GAMESTATE->m_pCurNotes[PLAYER_1] = GAMESTATE->m_pCurSong->GetNotes( STEPS_TYPE_DANCE_SINGLE, DIFFICULTY_HARD ); - GAMESTATE->m_pCurNotes[PLAYER_2] = GAMESTATE->m_pCurSong->GetNotes( STEPS_TYPE_DANCE_SINGLE, DIFFICULTY_HARD ); +// GAMESTATE->m_pCurCourse = SONGMAN->m_pCourses[0]; + GAMESTATE->m_pCurNotes[PLAYER_1] = GAMESTATE->m_pCurSong->m_apNotes[0]; + GAMESTATE->m_pCurNotes[PLAYER_2] = GAMESTATE->m_pCurSong->m_apNotes[0]; GAMESTATE->m_PlayerOptions[PLAYER_1].m_bHoldNotes = false; GAMESTATE->m_PlayerOptions[PLAYER_2].m_bHoldNotes = false; GAMESTATE->m_PlayerOptions[PLAYER_1].m_fScrollSpeed = 2; @@ -589,7 +593,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) if( SHOW_JUDGMENT(l) ) { - m_sprJudgeLabels[l].Load( THEME->GetPathToG("ScreenEvaluation judge labels 1x8") ); + m_sprJudgeLabels[l].Load( THEME->GetPathToG( "ScreenEvaluation judge labels" ) ); m_sprJudgeLabels[l].StopAnimating(); m_sprJudgeLabels[l].SetState( l ); m_sprJudgeLabels[l].SetName( ssprintf("%sLabel",JUDGE_STRING[l]) ); @@ -622,6 +626,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) case 5: iValue = stageStats.iTapNoteScores[p][TNS_MISS]; break; case 6: iValue = stageStats.iHoldNoteScores[p][HNS_OK]; break; case 7: iValue = stageStats.iMaxCombo[p]; break; + case 8: iValue = stageStats.iTotalError[p]; break; default: iValue = 0; ASSERT(0); } m_textJudgeNumbers[l][p].SetText( ssprintf("%4d",iValue) ); diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index 6cc87d6b42..2069f66d17 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -28,7 +28,7 @@ const int MAX_SONGS_TO_SHOW = 5; // In summary, we show last 3 stages, plus extra stages if passed -const int NUM_JUDGE_LINES = 8; // marvelous, perfect, great, good, boo, miss, ok, max_combo +const int NUM_JUDGE_LINES = 9; // marvelous, perfect, great, good, boo, miss, ok, max_combo, error const int NUM_SCORE_LINES = 2; // score, time