From 540ff632e2a155efb4e824ccf1e04f0f08d6cc67 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 22 Jul 2007 23:19:41 +0000 Subject: [PATCH] Simplify. Do not differentiate between misses and those that break the combo. --- stepmania/src/ScoreKeeperNormal.cpp | 32 ++++++++++++++--------------- stepmania/src/ScoreKeeperNormal.h | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp index 43eeeaad98..ecdd942bc4 100644 --- a/stepmania/src/ScoreKeeperNormal.cpp +++ b/stepmania/src/ScoreKeeperNormal.cpp @@ -439,7 +439,7 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn ) void ScoreKeeperNormal::HandleHoldCheckpointScore( const NoteData &nd, int iRow, int iNumHoldsHeldThisRow, int iNumHoldsMissedThisRow ) { HandleTapNoteScoreInternal( iNumHoldsMissedThisRow == 0? TNS_CheckpointHit:TNS_CheckpointMiss, TNS_CheckpointHit ); - HandleComboInternal( iNumHoldsHeldThisRow, 0, 0, iNumHoldsMissedThisRow ); + HandleComboInternal( iNumHoldsHeldThisRow, 0, iNumHoldsMissedThisRow ); } void ScoreKeeperNormal::HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum ) @@ -455,7 +455,7 @@ void ScoreKeeperNormal::HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteSco m_pPlayerStageStats->m_iCurPossibleDancePoints += TapNoteScoreToDancePoints( maximum ); } -void ScoreKeeperNormal::HandleComboInternal( int iNumHitContinueCombo, int iNumHitMaintainCombo, int iNumBreakCombo, int iNumMissedInRow ) +void ScoreKeeperNormal::HandleComboInternal( int iNumHitContinueCombo, int iNumHitMaintainCombo, int iNumBreakCombo ) { // // Regular combo @@ -464,27 +464,29 @@ void ScoreKeeperNormal::HandleComboInternal( int iNumHitContinueCombo, int iNumH { iNumHitContinueCombo = min( iNumHitContinueCombo, 1 ); iNumHitMaintainCombo = min( iNumHitMaintainCombo, 1 ); - iNumMissedInRow = min( iNumMissedInRow, 1 ); + iNumBreakCombo = min( iNumBreakCombo, 1 ); } if( iNumHitContinueCombo > 0 || iNumHitMaintainCombo > 0 ) m_pPlayerStageStats->m_iCurMissCombo = 0; - if( iNumMissedInRow > 0 || iNumBreakCombo > 0 ) - m_pPlayerStageStats->m_iCurCombo = 0; - - if( iNumMissedInRow == 0 ) + if( iNumBreakCombo == 0 ) + { m_pPlayerStageStats->m_iCurCombo += iNumHitContinueCombo; + } else - m_pPlayerStageStats->m_iCurMissCombo += iNumMissedInRow; + { + m_pPlayerStageStats->m_iCurCombo = 0; + m_pPlayerStageStats->m_iCurMissCombo += iNumBreakCombo; + } } void ScoreKeeperNormal::GetRowCounts( const NoteData &nd, int iRow, int &iNumHitContinueCombo, int &iNumHitMaintainCombo, - int &iNumBreakCombo, int &iNumMissedInRow ) + int &iNumBreakCombo ) { PlayerNumber pn = m_pPlayerState->m_PlayerNumber; - iNumHitContinueCombo = iNumHitMaintainCombo = iNumBreakCombo = iNumMissedInRow = 0; + iNumHitContinueCombo = iNumHitMaintainCombo = iNumBreakCombo = 0; for( int track = 0; track < nd.GetNumTracks(); ++track ) { const TapNote &tn = nd.GetTapNote( track, iRow ); @@ -498,8 +500,6 @@ void ScoreKeeperNormal::GetRowCounts( const NoteData &nd, int iRow, ++iNumHitContinueCombo; else if( tns >= m_MinScoreToMaintainCombo ) ++iNumHitMaintainCombo; - else if( tns == TNS_Miss || tns == TNS_None ) - ++iNumMissedInRow; else ++iNumBreakCombo; } @@ -507,17 +507,17 @@ void ScoreKeeperNormal::GetRowCounts( const NoteData &nd, int iRow, void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow ) { - int iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo, iNumMissedInRow; - GetRowCounts( nd, iRow, iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo, iNumMissedInRow ); + int iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo; + GetRowCounts( nd, iRow, iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo ); - int iNumTapsInRow = iNumHitContinueCombo + iNumHitMaintainCombo + iNumBreakCombo + iNumMissedInRow; + int iNumTapsInRow = iNumHitContinueCombo + iNumHitMaintainCombo + iNumBreakCombo; if( iNumTapsInRow <= 0 ) return; TapNoteScore scoreOfLastTap = NoteDataWithScoring::LastTapNoteWithResult( nd, iRow, m_pPlayerState->m_PlayerNumber ).result.tns; HandleTapNoteScoreInternal( scoreOfLastTap, TNS_W1 ); - HandleComboInternal( iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo, iNumMissedInRow ); + HandleComboInternal( iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo ); if( m_pPlayerState->m_PlayerNumber != PLAYER_INVALID ) MESSAGEMAN->Broadcast( enum_add2(Message_CurrentComboChangedP1,m_pPlayerState->m_PlayerNumber) ); diff --git a/stepmania/src/ScoreKeeperNormal.h b/stepmania/src/ScoreKeeperNormal.h index 54d9476915..629e7bca61 100644 --- a/stepmania/src/ScoreKeeperNormal.h +++ b/stepmania/src/ScoreKeeperNormal.h @@ -79,8 +79,8 @@ public: private: void HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum ); - void HandleComboInternal( int iNumHitContinueCombo, int iNumHitMaintainCombo, int iNumBreakCombo, int iNumMissedInRow ); - void GetRowCounts( const NoteData &nd, int iRow, int &iNumHitContinueCombo, int &iNumHitMaintainCombo, int &iNumBreakCombo, int &iNumMissedInRow ); + void HandleComboInternal( int iNumHitContinueCombo, int iNumHitMaintainCombo, int iNumBreakCombo ); + void GetRowCounts( const NoteData &nd, int iRow, int &iNumHitContinueCombo, int &iNumHitMaintainCombo, int &iNumBreakCombo ); };