From 767f10211ca8fdbdc4f1b9f31a630d16320dc90e Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Mon, 3 Nov 2003 00:16:18 +0000 Subject: [PATCH] Fixed: 'Key Press Bars' displaying if player pressed a key on Demo / Jukebox Screen Fixed: In-game Max Combo counter --- stepmania/src/Player.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index bb16942053..c065cfa24d 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -216,7 +216,7 @@ void PlayerMinus::Update( float fDeltaTime ) const StyleInput StyleI( m_PlayerNumber, bar ); const GameInput GameI = GAMESTATE->GetCurrentStyleDef()->StyleInputToGameInput( StyleI ); bool bIsHoldingButton = INPUTMAPPER->IsButtonDown( GameI ); - if(bIsHoldingButton) + if(bIsHoldingButton && !GAMESTATE->m_bDemonstrationOrJukebox) m_pNoteField->UpdateBars(bar); } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 4e2612bb20..ee7de35e32 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -423,7 +423,7 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S m_MaxCombo.LoadFromNumbers( THEME->GetPathToN("ScreenGameplay max combo") ); m_MaxCombo.SetName( "MaxCombo" ); SET_XY( m_MaxCombo ); - m_MaxCombo.SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iCurCombo[GAMESTATE->m_MasterPlayerNumber]) ); // TODO: Make this work for both players + m_MaxCombo.SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iMaxCombo[GAMESTATE->m_MasterPlayerNumber]) ); // TODO: Make this work for both players this->AddChild( &m_MaxCombo ); for( p=0; pm_MasterPlayerNumber != PLAYER_INVALID ) - m_MaxCombo.SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iCurCombo[GAMESTATE->m_MasterPlayerNumber]) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */ + m_MaxCombo.SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iMaxCombo[GAMESTATE->m_MasterPlayerNumber]) ); /* 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() );