From def4695b9e0712df4baefb5b68cf8f595b4cdc5e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 6 Feb 2003 17:47:00 +0000 Subject: [PATCH] p -> pn --- stepmania/src/ScreenGameplay.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 63f34660b3..938ffc46c4 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -726,8 +726,6 @@ void ScreenGameplay::Update( float fDeltaTime ) { Screen::Update( fDeltaTime ); - int pn; - if( GAMESTATE->m_pCurSong == NULL ) return; @@ -737,7 +735,7 @@ void ScreenGameplay::Update( float fDeltaTime ) m_MaxCombo.SetText( ssprintf("%d", m_Player[GAMESTATE->m_MasterPlayerNumber].GetPlayersMaxCombo()) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */ //LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() ); - + int pn; switch( m_DancingState ) { case STATE_DANCING: @@ -745,9 +743,9 @@ void ScreenGameplay::Update( float fDeltaTime ) // // Update players' alive time // - for( int p=0; pIsPlayerEnabled(p) ) - GAMESTATE->m_CurStageStats.fAliveSeconds[p] += fDeltaTime; + for( pn=0; pnIsPlayerEnabled(pn) ) + GAMESTATE->m_CurStageStats.fAliveSeconds[pn] += fDeltaTime; // // Check for end of song @@ -851,10 +849,10 @@ void ScreenGameplay::Update( float fDeltaTime ) { for( int r=m_iRowLastCrossed+1; r<=iRowNow; r++ ) // for each index we crossed since the last update { - for( int p=0; pIsPlayerEnabled(p) ) - m_Player[p].CrossedRow( r ); + if( GAMESTATE->IsPlayerEnabled(pn) ) + m_Player[pn].CrossedRow( r ); } }