Para Theme Update, New ScreenGamePlay element: MAXCOMBO (Currently I set the metric so only PARA sees this one) it gets the maxcombo from m_Combo which is inside the class Player which is inside ScreenGameplay. Lots of passing variables around but it works. Perhaps the maxcombo should become global?

This commit is contained in:
Andrew Livy
2002-11-07 19:42:39 +00:00
parent 00d85d1c09
commit 0cac950d90
5 changed files with 23 additions and 3 deletions
+10
View File
@@ -32,6 +32,9 @@
// Defines
//
#define MAXCOMBO_X THEME->GetMetricF("ScreenGameplay","MAXCOMBOX")
#define MAXCOMBO_Y THEME->GetMetricF("ScreenGameplay","MAXCOMBOY")
#define MAXCOMBO_ZOOM THEME->GetMetricF("ScreenGameplay","MAXCOMBOZoom")
#define BPM_X THEME->GetMetricF("ScreenGameplay","BPMX")
#define BPM_Y THEME->GetMetricF("ScreenGameplay","BPMY")
#define BPM_ZOOM THEME->GetMetricF("ScreenGameplay","BPMZoom")
@@ -282,6 +285,12 @@ ScreenGameplay::ScreenGameplay()
m_StageName.SetText( GAMESTATE->m_pCurSong->m_sMainTitle );
this->AddChild( &m_StageName );
m_MaxCombo.LoadFromNumbers( THEME->GetPathTo("Numbers","gameplay score numbers") );
m_MaxCombo.SetXY( MAXCOMBO_X, MAXCOMBO_Y );
m_MaxCombo.SetZoom( MAXCOMBO_ZOOM );
m_MaxCombo.SetText( ssprintf("%d", m_Player[GAMESTATE->m_MasterPlayerNumber].GetPlayersMaxCombo()) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */
this->AddChild( &m_MaxCombo );
for( p=0; p<NUM_PLAYERS; p++ )
{
if( !GAMESTATE->IsPlayerEnabled(PlayerNumber(p)) )
@@ -703,6 +712,7 @@ void ScreenGameplay::Update( float fDeltaTime )
GAMESTATE->m_fSongBeat = fSongBeat;
GAMESTATE->m_fCurBPS = fBPS;
GAMESTATE->m_bFreeze = bFreeze;
m_MaxCombo.SetText( ssprintf("%d", m_Player[GAMESTATE->m_MasterPlayerNumber].GetPlayersMaxCombo()) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */
// printf( "m_fSongBeat = %f\n", GAMESTATE->m_fSongBeat );