From 30dc9974ab33d960226ac77fa7e7763c8159ba93 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 14 Nov 2006 21:56:59 +0000 Subject: [PATCH] simplify --- stepmania/src/Player.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 4f33032a3b..6c27b17193 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -1737,16 +1737,16 @@ void Player::HandleTapRowScore( unsigned row ) bool bComboStopped = false; bool bMissComboStopped = false; + const int iCurCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0; + const int iCurMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0; + if( m_pPrimaryScoreKeeper != NULL ) m_pPrimaryScoreKeeper->HandleTapRowScore( m_NoteData, row, bComboStopped, bMissComboStopped ); - if( bComboStopped && iOldCombo > 50 ) + if( iOldCombo > 50 && iCurCombo < 50 ) SCREENMAN->PostMessageToTopScreen( SM_ComboStopped, 0 ); if( m_pSecondaryScoreKeeper != NULL ) m_pSecondaryScoreKeeper->HandleTapRowScore( m_NoteData, row, bComboStopped, bMissComboStopped ); - const int iCurCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0; - const int iCurMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0; - if( m_pPlayerStageStats && m_pCombo ) { m_pCombo->SetCombo( iCurCombo, iCurMissCombo );