diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index e6835fb87b..143e67a3d4 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -66,7 +66,7 @@ void LifeMeterBattery::Load( PlayerNumber pn ) if( bPlayerEnabled ) { m_Percent.SetName( "LifeMeterBattery Percent" ); - m_Percent.Load( pn, &g_CurStageStats ); + m_Percent.Load( pn, &g_CurStageStats, true ); this->AddChild( &m_Percent ); } diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp index 50414dfd0c..b56a400b1b 100644 --- a/stepmania/src/PercentageDisplay.cpp +++ b/stepmania/src/PercentageDisplay.cpp @@ -18,11 +18,12 @@ PercentageDisplay::PercentageDisplay() m_pSource = NULL; } -void PercentageDisplay::Load( PlayerNumber pn, StageStats* pSource ) +void PercentageDisplay::Load( PlayerNumber pn, StageStats* pSource, bool bAutoRefresh ) { ASSERT( m_sName != "" ); // set this! m_PlayerNumber = pn; m_pSource = pSource; + m_bAutoRefresh = bAutoRefresh; m_Last = -1; if( PREFSMAN->m_bDancePointsForOni ) @@ -57,7 +58,8 @@ void PercentageDisplay::Update( float fDeltaTime ) { ActorFrame::Update( fDeltaTime ); - Refresh(); + if( m_bAutoRefresh ) + Refresh(); } void PercentageDisplay::Refresh() diff --git a/stepmania/src/PercentageDisplay.h b/stepmania/src/PercentageDisplay.h index afe77cb350..90333da81d 100644 --- a/stepmania/src/PercentageDisplay.h +++ b/stepmania/src/PercentageDisplay.h @@ -10,7 +10,7 @@ class PercentageDisplay: public ActorFrame { public: PercentageDisplay(); - void Load( PlayerNumber pn, StageStats *pSource ); + void Load( PlayerNumber pn, StageStats *pSource, bool bAutoRefresh ); void Update( float fDeltaTime ); void TweenOffScreen(); @@ -18,6 +18,7 @@ private: void Refresh(); PlayerNumber m_PlayerNumber; StageStats *m_pSource; + bool m_bAutoRefresh; int m_Last; BitmapText m_textPercent; BitmapText m_textPercentRemainder; diff --git a/stepmania/src/ScoreDisplayPercentage.cpp b/stepmania/src/ScoreDisplayPercentage.cpp index 37d644ea1f..9d7a04e815 100644 --- a/stepmania/src/ScoreDisplayPercentage.cpp +++ b/stepmania/src/ScoreDisplayPercentage.cpp @@ -15,5 +15,5 @@ ScoreDisplayPercentage::ScoreDisplayPercentage() void ScoreDisplayPercentage::Init( PlayerNumber pn ) { - m_Percent.Load( pn, &g_CurStageStats ); + m_Percent.Load( pn, &g_CurStageStats, true ); } diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 6a1a2bee85..4fb7c0fb21 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -496,7 +496,7 @@ void ScreenEvaluation::Init() /* Use "ScreenEvaluation Percent" for the [metric set], but position and * tween it with "PercentP1X", etc. */ m_Percent[p].SetName( "ScreenEvaluation Percent" ); - m_Percent[p].Load( (PlayerNumber) p, &g_CurStageStats ); + m_Percent[p].Load( (PlayerNumber) p, &g_CurStageStats, true ); m_Percent[p].SetXY( THEME->GetMetricF(m_sName, ssprintf("PercentP%dX",p+1)), THEME->GetMetricF(m_sName,ssprintf("PercentP%dY",p+1)) ); m_Percent[p].Command( THEME->GetMetric(m_sName,ssprintf("PercentP%dOnCommand",p+1)) ); diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index b37948c290..f6161a7d71 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -377,7 +377,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S this->AddChild( &m_FeatDisplay[p][i].m_Difficulty ); m_FeatDisplay[p][i].m_textScore.SetName( "ScreenNameEntryTraditional Percent" ); - m_FeatDisplay[p][i].m_textScore.Load( (PlayerNumber)p, &ss ); + m_FeatDisplay[p][i].m_textScore.Load( (PlayerNumber)p, &ss, false ); m_FeatDisplay[p][i].m_textScore.SetName( ssprintf("ScoreP%i",p+1) ); SET_ON( m_FeatDisplay[p][i].m_textScore ); this->AddChild( &m_FeatDisplay[p][i].m_textScore );