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

Handle avoided mines. Hit mines are still broken.

Browse Source
This commit is contained in:
Steve Checkoway
2006-07-20 07:31:39 +00:00
parent 8292201ad6
commit 705d929106
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+12 -2
View File
@@ -1373,9 +1373,15 @@ void Player::UpdateTapNotesMissedOlderThan( float fMissIfOlderThanSeconds )
//Let the server know we avoided a mine //Let the server know we avoided a mine
//Hit mines are sent to the server in HandleTapScore //Hit mines are sent to the server in HandleTapScore
NSMAN->ReportScore( m_pPlayerState->m_PlayerNumber, tn.result.tns, NSMAN->ReportScore( m_pPlayerState->m_PlayerNumber, TNS_AvoidMine,
m_pPlayerStageStats->iScore, m_pPlayerStageStats->iScore,
m_pPlayerStageStats->iCurCombo ); m_pPlayerStageStats->iCurCombo );
// Mines are counted as being judged right away so we must report this now because this
// row is likely to have been judged already.
if( m_pPrimaryScoreKeeper )
m_pPrimaryScoreKeeper->HandleTapScore( tn );
if( m_pSecondaryScoreKeeper )
m_pSecondaryScoreKeeper->HandleTapScore( tn );
} }
else else
{ {
@@ -1553,8 +1559,12 @@ void Player::HandleTapRowScore( unsigned row )
for( int track = 0; track < m_NoteData.GetNumTracks(); ++track ) for( int track = 0; track < m_NoteData.GetNumTracks(); ++track )
{ {
const TapNote &tn = m_NoteData.GetTapNote( track, row ); const TapNote &tn = m_NoteData.GetTapNote( track, row );
// Mines cannot be handled here.
if( tn.type == TapNote::empty || tn.type == TapNote::mine )
continue;
if( tn.pn != PLAYER_INVALID && tn.pn != pn ) if( tn.pn != PLAYER_INVALID && tn.pn != pn )
continue; continue;
#if 0
if( tn.result.tns == TNS_HitMine ) if( tn.result.tns == TNS_HitMine )
{ {
if( tn.bKeysound && tn.iKeysoundIndex < (int) m_vKeysounds.size() ) if( tn.bKeysound && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
@@ -1577,7 +1587,7 @@ void Player::HandleTapRowScore( unsigned row )
if( m_pNoteField ) if( m_pNoteField )
m_pNoteField->DidTapNote( track, tn.result.tns, false ); m_pNoteField->DidTapNote( track, tn.result.tns, false );
} }
#endif
if( m_pPrimaryScoreKeeper ) if( m_pPrimaryScoreKeeper )
m_pPrimaryScoreKeeper->HandleTapScore( tn ); m_pPrimaryScoreKeeper->HandleTapScore( tn );
if( m_pSecondaryScoreKeeper ) if( m_pSecondaryScoreKeeper )