From 7315aa915289878b869574afd5cccbb808e6d237 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 17 Mar 2007 00:32:26 +0000 Subject: [PATCH] fix editor receptor flash --- stepmania/src/Player.cpp | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 438f50169c..1556a290f7 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -2262,36 +2262,39 @@ void Player::CrossedRows( int iFirstRowCrossed, int iLastRowCrossed, const RageT if( !viColsWithHold.empty() ) { + // increment combo + const int iOldCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0; + const int iOldMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0; + if( m_pPlayerStageStats ) { - // increment combo - const int iOldCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0; - const int iOldMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0; - if( bAllHoldsHeldThisRow ) { m_pPlayerStageStats->m_iCurCombo++; m_pPlayerStageStats->m_iCurMissCombo = 0; - - FOREACH( int, viColsWithHold, i ) - { - bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD; - if( m_pNoteField ) - m_pNoteField->DidHoldNote( *i, HNS_Held, bBright ); - } } else { m_pPlayerStageStats->m_iCurCombo = 0; m_pPlayerStageStats->m_iCurMissCombo++; } + } - SendComboMessages( iOldCombo, iOldMissCombo ); - if( m_pPlayerStageStats ) + if( bAllHoldsHeldThisRow ) + { + FOREACH( int, viColsWithHold, i ) { - SetCombo( m_pPlayerStageStats->m_iCurCombo, m_pPlayerStageStats->m_iCurMissCombo ); + bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD; + if( m_pNoteField ) + m_pNoteField->DidHoldNote( *i, HNS_Held, bBright ); } } + + SendComboMessages( iOldCombo, iOldMissCombo ); + if( m_pPlayerStageStats ) + { + SetCombo( m_pPlayerStageStats->m_iCurCombo, m_pPlayerStageStats->m_iCurMissCombo ); + } } } }