Add some .result hooks.

Have to find the other place to grab them.
This commit is contained in:
Jason Felds
2011-07-09 12:54:13 -04:00
parent c139537ce6
commit 187415bc70
+32
View File
@@ -2497,6 +2497,8 @@ done_checking_hopo:
if( score != TNS_None ) if( score != TNS_None )
{ {
ComboSegment &cs = m_Timing->GetComboSegmentAtRow(row);
switch( pbt ) switch( pbt )
{ {
DEFAULT_FAIL(pbt); DEFAULT_FAIL(pbt);
@@ -2508,17 +2510,47 @@ done_checking_hopo:
{ {
tn.result.tns = score; tn.result.tns = score;
tn.result.fTapNoteOffset = -fNoteOffset; tn.result.fTapNoteOffset = -fNoteOffset;
if (score > MIN_SCORE_TO_CONTINUE_COMBO)
{
tn.result.numJudgments = cs.GetCombo();
}
else if (score < MIN_SCORE_TO_MAINTAIN_COMBO)
{
tn.result.numJudgments = cs.GetMissCombo();
}
else
{
tn.result.numJudgments = 1; // sanity check
}
m_NoteData.SetTapNote( t, iRowOfOverlappingNoteOrRow, tn ); m_NoteData.SetTapNote( t, iRowOfOverlappingNoteOrRow, tn );
} }
} }
break; break;
case ButtonType_Hopo: case ButtonType_Hopo:
case ButtonType_Step: case ButtonType_Step:
{
pTN->result.tns = score; pTN->result.tns = score;
pTN->result.fTapNoteOffset = -fNoteOffset; pTN->result.fTapNoteOffset = -fNoteOffset;
if (score > MIN_SCORE_TO_CONTINUE_COMBO)
{
pTN->result.numJudgments = cs.GetCombo();
}
else if (score < MIN_SCORE_TO_MAINTAIN_COMBO)
{
pTN->result.numJudgments = cs.GetMissCombo();
}
else
{
pTN->result.numJudgments = 1; // sanity check
}
break; break;
} }
} }
}
m_LastTapNoteScore = score; m_LastTapNoteScore = score;
if( GAMESTATE->GetCurrentGame()->m_bCountNotesSeparately ) if( GAMESTATE->GetCurrentGame()->m_bCountNotesSeparately )