From c7c28b9aea07463843b8236595ebf472334adc02 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 10 Jan 2005 15:18:13 +0000 Subject: [PATCH] narrow StageStats* -> PlayerStageStats* --- stepmania/src/LifeMeterBattery.cpp | 2 +- stepmania/src/PercentageDisplay.cpp | 6 +++--- stepmania/src/PercentageDisplay.h | 4 ++-- stepmania/src/ScoreDisplayPercentage.cpp | 2 +- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenNameEntryTraditional.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index 26e4e9c30e..536ff6df6a 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -55,7 +55,7 @@ void LifeMeterBattery::Load( PlayerNumber pn ) if( bPlayerEnabled ) { m_Percent.SetName( "LifeMeterBattery Percent" ); - m_Percent.Load( pn, &g_CurStageStats, true ); + m_Percent.Load( pn, &g_CurStageStats.m_player[pn], true ); this->AddChild( &m_Percent ); } diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp index 6ae877da24..ad874d1cb4 100644 --- a/stepmania/src/PercentageDisplay.cpp +++ b/stepmania/src/PercentageDisplay.cpp @@ -18,7 +18,7 @@ PercentageDisplay::PercentageDisplay() m_pSource = NULL; } -void PercentageDisplay::Load( PlayerNumber pn, StageStats* pSource, bool bAutoRefresh ) +void PercentageDisplay::Load( PlayerNumber pn, PlayerStageStats* pSource, bool bAutoRefresh ) { ASSERT( m_sName != "" ); // set this! m_PlayerNumber = pn; @@ -64,7 +64,7 @@ void PercentageDisplay::Update( float fDeltaTime ) void PercentageDisplay::Refresh() { - const int iActualDancePoints = m_pSource->m_player[m_PlayerNumber].iActualDancePoints; + const int iActualDancePoints = m_pSource->iActualDancePoints; if( iActualDancePoints == m_Last ) return; @@ -77,7 +77,7 @@ void PercentageDisplay::Refresh() } else { - float fPercentDancePoints = m_pSource->m_player[m_PlayerNumber].GetPercentDancePoints(); + float fPercentDancePoints = m_pSource->GetPercentDancePoints(); // clamp percentage - feedback is that negative numbers look weird here. CLAMP( fPercentDancePoints, 0.f, 1.f ); diff --git a/stepmania/src/PercentageDisplay.h b/stepmania/src/PercentageDisplay.h index c068d6f1ad..c799245eb4 100644 --- a/stepmania/src/PercentageDisplay.h +++ b/stepmania/src/PercentageDisplay.h @@ -10,14 +10,14 @@ class PercentageDisplay: public ActorFrame { public: PercentageDisplay(); - void Load( PlayerNumber pn, StageStats *pSource, bool bAutoRefresh ); + void Load( PlayerNumber pn, PlayerStageStats *pSource, bool bAutoRefresh ); void Update( float fDeltaTime ); void TweenOffScreen(); private: void Refresh(); PlayerNumber m_PlayerNumber; - StageStats *m_pSource; + PlayerStageStats *m_pSource; bool m_bAutoRefresh; int m_Last; BitmapText m_textPercent; diff --git a/stepmania/src/ScoreDisplayPercentage.cpp b/stepmania/src/ScoreDisplayPercentage.cpp index 2b6dce0b98..0481a7850a 100644 --- a/stepmania/src/ScoreDisplayPercentage.cpp +++ b/stepmania/src/ScoreDisplayPercentage.cpp @@ -16,7 +16,7 @@ ScoreDisplayPercentage::ScoreDisplayPercentage() void ScoreDisplayPercentage::Init( const PlayerState* pPlayerState ) { - m_Percent.Load( pPlayerState->m_PlayerNumber, &g_CurStageStats, true ); + m_Percent.Load( pPlayerState->m_PlayerNumber, &g_CurStageStats.m_player[pPlayerState->m_PlayerNumber], true ); } /* diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 75aaf1691b..9086039557 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -517,7 +517,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( p, &g_CurStageStats, true ); + m_Percent[p].Load( p, &g_CurStageStats.m_player[p], 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].RunCommands( THEME->GetMetricA(m_sName,ssprintf("PercentP%dOnCommand",p+1)) ); diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index 3ee25d5c31..327bbdcd53 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -382,7 +382,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S this->AddChild( &display.m_Difficulty ); display.m_textScore.SetName( "ScreenNameEntryTraditional Percent" ); - display.m_textScore.Load( p, &ss, false ); + display.m_textScore.Load( p, &ss.m_player[p], false ); display.m_textScore.SetName( ssprintf("ScoreP%i",p+1) ); SET_ON( display.m_textScore ); this->AddChild( &display.m_textScore );