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

Nudge these together.

Browse Source
This commit is contained in:
Steve Checkoway
2006-07-20 06:42:25 +00:00
parent b38a2797ea
commit 232a3c10b0
1 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+17 -38
View File
@@ -1290,51 +1290,30 @@ void Player::OnRowCompletelyJudged( int iIndexThatWasSteppedOn )
/* Find the final score of the row. This will never be TNS_None, since this /* Find the final score of the row. This will never be TNS_None, since this
* function is only called when a row is completed. */ * function is only called when a row is completed. */
const Game *pCurGame = GAMESTATE->m_pCurGame;
PlayerNumber pn = m_pPlayerState->m_PlayerNumber; PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
bool bSeparately = GAMESTATE->GetCurrentGame()->m_bCountNotesSeparately;
if( !pCurGame->m_bCountNotesSeparately ) const TapNoteResult &lastTNR = NoteDataWithScoring::LastTapNoteWithResult( m_NoteData, iIndexThatWasSteppedOn, pn ).result;
ASSERT( lastTNR.tns != TNS_None );
ASSERT( lastTNR.tns != TNS_HitMine );
ASSERT( lastTNR.tns != TNS_AvoidMine );
for( int c = 0; c < m_NoteData.GetNumTracks(); ++c )
{ {
TapNoteResult tnr = NoteDataWithScoring::LastTapNoteWithResult( m_NoteData, iIndexThatWasSteppedOn, pn ).result; const TapNote &tn = m_NoteData.GetTapNote( c, iIndexThatWasSteppedOn );
TapNoteScore score = tnr.tns;
ASSERT( score != TNS_None ); if( tn.type == TapNote::empty ) continue; /* no note in this col */
ASSERT( score != TNS_HitMine ); if( tn.type == TapNote::mine ) continue; /* don't flash on mines b/c they're supposed to be missed */
ASSERT( score != TNS_AvoidMine ); if( tn.pn != PLAYER_INVALID && tn.pn != pn ) continue; /* Not our note. */
/* If the whole row was hit with perfects or greats, remove the row TapNoteScore score = bSeparately ? tn.result.tns : lastTNR.tns;
* from the NoteField, so it disappears. */
for( int c=0; c<m_NoteData.GetNumTracks(); c++ ) // for each column DisplayJudgedRow( iIndexThatWasSteppedOn, score, c );
{ if( bSeparately )
const TapNote &tn = m_NoteData.GetTapNote( c, iIndexThatWasSteppedOn ); SetJudgment( score, tn.result.fTapNoteOffset < 0.0f );
if( tn.type == TapNote::empty ) continue; /* no note in this col */
if( tn.type == TapNote::mine ) continue; /* don't flash on mines b/c they're supposed to be missed */
if( tn.pn != PLAYER_INVALID && tn.pn != pn ) continue; /* Not our note. */
DisplayJudgedRow( iIndexThatWasSteppedOn, score, c );
}
SetJudgment( score, tnr.fTapNoteOffset < 0 );
}
else
{
for( int c=0; c<m_NoteData.GetNumTracks(); c++ ) // for each column
{
const TapNote &tn = m_NoteData.GetTapNote(c, iIndexThatWasSteppedOn);
TapNoteResult tnr = tn.result;
TapNoteScore score = tnr.tns;
if( tn.type == TapNote::empty ) continue; /* no note in this col */
if( tn.type == TapNote::mine ) continue; /* don't flash on mines b/c they're supposed to be missed */
if( tn.pn != PLAYER_INVALID && tn.pn != pn ) continue; /* Not our note. */
DisplayJudgedRow( iIndexThatWasSteppedOn, score, c );
SetJudgment( score, tnr.fTapNoteOffset < 0 );
}
} }
if( !bSeparately )
SetJudgment( lastTNR.tns, lastTNR.fTapNoteOffset < 0.0f );
HandleTapRowScore( iIndexThatWasSteppedOn ); // update score HandleTapRowScore( iIndexThatWasSteppedOn ); // update score
} }