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

Simplify. Do not differentiate between misses and those that break the combo.

Browse Source
This commit is contained in:
Steve Checkoway
2007-07-22 23:19:41 +00:00
parent 43cdeb0fcd
commit 540ff632e2
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScoreKeeperNormal.cpp
+16 -16
View File
@@ -439,7 +439,7 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn )
void ScoreKeeperNormal::HandleHoldCheckpointScore( const NoteData &nd, int iRow, int iNumHoldsHeldThisRow, int iNumHoldsMissedThisRow ) void ScoreKeeperNormal::HandleHoldCheckpointScore( const NoteData &nd, int iRow, int iNumHoldsHeldThisRow, int iNumHoldsMissedThisRow )
{ {
HandleTapNoteScoreInternal( iNumHoldsMissedThisRow == 0? TNS_CheckpointHit:TNS_CheckpointMiss, TNS_CheckpointHit ); 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 ) void ScoreKeeperNormal::HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum )
@@ -455,7 +455,7 @@ void ScoreKeeperNormal::HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteSco
m_pPlayerStageStats->m_iCurPossibleDancePoints += TapNoteScoreToDancePoints( maximum ); 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 // Regular combo
@@ -464,27 +464,29 @@ void ScoreKeeperNormal::HandleComboInternal( int iNumHitContinueCombo, int iNumH
{ {
iNumHitContinueCombo = min( iNumHitContinueCombo, 1 ); iNumHitContinueCombo = min( iNumHitContinueCombo, 1 );
iNumHitMaintainCombo = min( iNumHitMaintainCombo, 1 ); iNumHitMaintainCombo = min( iNumHitMaintainCombo, 1 );
iNumMissedInRow = min( iNumMissedInRow, 1 ); iNumBreakCombo = min( iNumBreakCombo, 1 );
} }
if( iNumHitContinueCombo > 0 || iNumHitMaintainCombo > 0 ) if( iNumHitContinueCombo > 0 || iNumHitMaintainCombo > 0 )
m_pPlayerStageStats->m_iCurMissCombo = 0; m_pPlayerStageStats->m_iCurMissCombo = 0;
if( iNumMissedInRow > 0 || iNumBreakCombo > 0 ) if( iNumBreakCombo == 0 )
m_pPlayerStageStats->m_iCurCombo = 0; {
if( iNumMissedInRow == 0 )
m_pPlayerStageStats->m_iCurCombo += iNumHitContinueCombo; m_pPlayerStageStats->m_iCurCombo += iNumHitContinueCombo;
}
else else
m_pPlayerStageStats->m_iCurMissCombo += iNumMissedInRow; {
m_pPlayerStageStats->m_iCurCombo = 0;
m_pPlayerStageStats->m_iCurMissCombo += iNumBreakCombo;
}
} }
void ScoreKeeperNormal::GetRowCounts( const NoteData &nd, int iRow, void ScoreKeeperNormal::GetRowCounts( const NoteData &nd, int iRow,
int &iNumHitContinueCombo, int &iNumHitMaintainCombo, int &iNumHitContinueCombo, int &iNumHitMaintainCombo,
int &iNumBreakCombo, int &iNumMissedInRow ) int &iNumBreakCombo )
{ {
PlayerNumber pn = m_pPlayerState->m_PlayerNumber; PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
iNumHitContinueCombo = iNumHitMaintainCombo = iNumBreakCombo = iNumMissedInRow = 0; iNumHitContinueCombo = iNumHitMaintainCombo = iNumBreakCombo = 0;
for( int track = 0; track < nd.GetNumTracks(); ++track ) for( int track = 0; track < nd.GetNumTracks(); ++track )
{ {
const TapNote &tn = nd.GetTapNote( track, iRow ); const TapNote &tn = nd.GetTapNote( track, iRow );
@@ -498,8 +500,6 @@ void ScoreKeeperNormal::GetRowCounts( const NoteData &nd, int iRow,
++iNumHitContinueCombo; ++iNumHitContinueCombo;
else if( tns >= m_MinScoreToMaintainCombo ) else if( tns >= m_MinScoreToMaintainCombo )
++iNumHitMaintainCombo; ++iNumHitMaintainCombo;
else if( tns == TNS_Miss || tns == TNS_None )
++iNumMissedInRow;
else else
++iNumBreakCombo; ++iNumBreakCombo;
} }
@@ -507,17 +507,17 @@ void ScoreKeeperNormal::GetRowCounts( const NoteData &nd, int iRow,
void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow ) void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow )
{ {
int iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo, iNumMissedInRow; int iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo;
GetRowCounts( nd, iRow, iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo, iNumMissedInRow ); GetRowCounts( nd, iRow, iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo );
int iNumTapsInRow = iNumHitContinueCombo + iNumHitMaintainCombo + iNumBreakCombo + iNumMissedInRow; int iNumTapsInRow = iNumHitContinueCombo + iNumHitMaintainCombo + iNumBreakCombo;
if( iNumTapsInRow <= 0 ) if( iNumTapsInRow <= 0 )
return; return;
TapNoteScore scoreOfLastTap = NoteDataWithScoring::LastTapNoteWithResult( nd, iRow, m_pPlayerState->m_PlayerNumber ).result.tns; TapNoteScore scoreOfLastTap = NoteDataWithScoring::LastTapNoteWithResult( nd, iRow, m_pPlayerState->m_PlayerNumber ).result.tns;
HandleTapNoteScoreInternal( scoreOfLastTap, TNS_W1 ); HandleTapNoteScoreInternal( scoreOfLastTap, TNS_W1 );
HandleComboInternal( iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo, iNumMissedInRow ); HandleComboInternal( iNumHitContinueCombo, iNumHitMaintainCombo, iNumBreakCombo );
if( m_pPlayerState->m_PlayerNumber != PLAYER_INVALID ) if( m_pPlayerState->m_PlayerNumber != PLAYER_INVALID )
MESSAGEMAN->Broadcast( enum_add2(Message_CurrentComboChangedP1,m_pPlayerState->m_PlayerNumber) ); MESSAGEMAN->Broadcast( enum_add2(Message_CurrentComboChangedP1,m_pPlayerState->m_PlayerNumber) );
stepmania/src/ScoreKeeperNormal.h
+2 -2
View File
@@ -79,8 +79,8 @@ public:
private: private:
void HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum ); void HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum );
void HandleComboInternal( 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, int &iNumMissedInRow ); void GetRowCounts( const NoteData &nd, int iRow, int &iNumHitContinueCombo, int &iNumHitMaintainCombo, int &iNumBreakCombo );
}; };