From d365e8e959ebed11b921c819ef03d2a12ec1d67b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 31 Oct 2003 03:10:31 +0000 Subject: [PATCH] add SHOW_FULL_COMBO --- stepmania/src/ScreenEvaluation.cpp | 8 ++++++++ stepmania/src/ScreenEvaluation.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 1b799feac8..755305c2e9 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -58,6 +58,7 @@ const char* JUDGE_STRING[NUM_JUDGE_LINES] = #define SHOW_TIME_AREA THEME->GetMetricB(m_sName,"ShowTimeArea") #define SHOW_GRAPH_AREA THEME->GetMetricB(m_sName,"ShowGraphArea") #define SHOW_COMBO_AREA THEME->GetMetricB(m_sName,"ShowComboArea") +#define SHOW_FULL_COMBO THEME->GetMetricB(m_sName,"ShowFullCombo") #define GRAPH_START_HEIGHT THEME->GetMetricF(m_sName,"GraphStartHeight") #define TYPE THEME->GetMetric (m_sName,"Type") @@ -712,6 +713,12 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) UtilSetXYAndOnCommand( m_sprPersonalRecord[p], "ScreenEvaluation" ); this->AddChild( &m_sprPersonalRecord[p] ); } + + if( SHOW_FULL_COMBO && stageStats.FullCombo( (PlayerNumber) p ) ) + { + m_FullCombo[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation full combo P%i",p+1)) ); + this->AddChild( m_FullCombo[p] ); + } } bool bOneHasNewTopRecord = false; @@ -936,6 +943,7 @@ void ScreenEvaluation::TweenOffScreen() continue; UtilOffCommand( m_sprMachineRecord[p], "ScreenEvaluation" ); UtilOffCommand( m_sprPersonalRecord[p], "ScreenEvaluation" ); + UtilOffCommand( m_FullCombo[p], "ScreenEvaluation" ); } UtilOffCommand( m_sprTryExtraStage, "ScreenEvaluation" ); } diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index 2069f66d17..094ed621bc 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -25,6 +25,8 @@ #include "PercentageDisplay.h" #include "GraphDisplay.h" #include "ComboGraph.h" +#include "BGAnimation.h" +#include "ActorUtil.h" const int MAX_SONGS_TO_SHOW = 5; // In summary, we show last 3 stages, plus extra stages if passed @@ -112,6 +114,7 @@ protected: Sprite m_sprPersonalRecord[NUM_PLAYERS]; bool m_bTryExtraStage; Sprite m_sprTryExtraStage; + AutoActor m_FullCombo[NUM_PLAYERS]; }; #endif