actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed: 'Key Press Bars' displaying if player pressed a key on Demo / Jukebox Screen

Browse Source 
Fixed: In-game Max Combo counter
This commit is contained in:
Andrew Livy
2003-11-03 00:16:18 +00:00
parent 9d3885abdb
commit 767f10211c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+1 -1
View File
@@ -216,7 +216,7 @@ void PlayerMinus::Update( float fDeltaTime )
const StyleInput StyleI( m_PlayerNumber, bar ); const StyleInput StyleI( m_PlayerNumber, bar );
const GameInput GameI = GAMESTATE->GetCurrentStyleDef()->StyleInputToGameInput( StyleI ); const GameInput GameI = GAMESTATE->GetCurrentStyleDef()->StyleInputToGameInput( StyleI );
bool bIsHoldingButton = INPUTMAPPER->IsButtonDown( GameI ); bool bIsHoldingButton = INPUTMAPPER->IsButtonDown( GameI );
if(bIsHoldingButton) if(bIsHoldingButton && !GAMESTATE->m_bDemonstrationOrJukebox)
m_pNoteField->UpdateBars(bar); m_pNoteField->UpdateBars(bar);
} }
stepmania/src/ScreenGameplay.cpp
+2 -2
View File
@@ -423,7 +423,7 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S
m_MaxCombo.LoadFromNumbers( THEME->GetPathToN("ScreenGameplay max combo") ); m_MaxCombo.LoadFromNumbers( THEME->GetPathToN("ScreenGameplay max combo") );
m_MaxCombo.SetName( "MaxCombo" ); m_MaxCombo.SetName( "MaxCombo" );
SET_XY( m_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 ); this->AddChild( &m_MaxCombo );
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
@@ -1052,7 +1052,7 @@ void ScreenGameplay::Update( float fDeltaTime )
return; return;
if( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID ) if( GAMESTATE->m_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() ); //LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() );