fix editor receptor flash

This commit is contained in:
Glenn Maynard
2007-03-17 00:32:26 +00:00
parent d74382fe07
commit 7315aa9152
+11 -8
View File
@@ -2261,18 +2261,27 @@ void Player::CrossedRows( int iFirstRowCrossed, int iLastRowCrossed, const RageT
} }
if( !viColsWithHold.empty() ) if( !viColsWithHold.empty() )
{
if( m_pPlayerStageStats )
{ {
// increment combo // increment combo
const int iOldCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0; const int iOldCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0;
const int iOldMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0; const int iOldMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0;
if( m_pPlayerStageStats )
{
if( bAllHoldsHeldThisRow ) if( bAllHoldsHeldThisRow )
{ {
m_pPlayerStageStats->m_iCurCombo++; m_pPlayerStageStats->m_iCurCombo++;
m_pPlayerStageStats->m_iCurMissCombo = 0; m_pPlayerStageStats->m_iCurMissCombo = 0;
}
else
{
m_pPlayerStageStats->m_iCurCombo = 0;
m_pPlayerStageStats->m_iCurMissCombo++;
}
}
if( bAllHoldsHeldThisRow )
{
FOREACH( int, viColsWithHold, i ) FOREACH( int, viColsWithHold, i )
{ {
bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD; bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD;
@@ -2280,11 +2289,6 @@ void Player::CrossedRows( int iFirstRowCrossed, int iLastRowCrossed, const RageT
m_pNoteField->DidHoldNote( *i, HNS_Held, bBright ); m_pNoteField->DidHoldNote( *i, HNS_Held, bBright );
} }
} }
else
{
m_pPlayerStageStats->m_iCurCombo = 0;
m_pPlayerStageStats->m_iCurMissCombo++;
}
SendComboMessages( iOldCombo, iOldMissCombo ); SendComboMessages( iOldCombo, iOldMissCombo );
if( m_pPlayerStageStats ) if( m_pPlayerStageStats )
@@ -2295,7 +2299,6 @@ void Player::CrossedRows( int iFirstRowCrossed, int iLastRowCrossed, const RageT
} }
} }
} }
}
void Player::CrossedMineRow( int iNoteRow, const RageTimer &now ) void Player::CrossedMineRow( int iNoteRow, const RageTimer &now )
{ {