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

fix missed checkpoints still counts as full combo

Browse Source
This commit is contained in:
Chris Danford
2008-07-08 00:48:26 +00:00
parent 193265d51c
commit d1f939f486
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+9 -8
View File
@@ -1042,6 +1042,8 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
// score hold notes that have passed // score hold notes that have passed
if( iSongRow >= iMaxEndRow ) if( iSongRow >= iMaxEndRow )
{ {
bool bLetGoOfHoldNote = false;
/* Score rolls that end with fLife == 0 as LetGo, even if HOLD_CHECKPOINTS is on. /* Score rolls that end with fLife == 0 as LetGo, even if HOLD_CHECKPOINTS is on.
* Rolls don't have iCheckpointsMissed set, so, unless we check Life == 0, rolls would always be * Rolls don't have iCheckpointsMissed set, so, unless we check Life == 0, rolls would always be
* scored as Held. */ * scored as Held. */
@@ -1057,28 +1059,27 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
break; break;
} }
bool bAllowScoreAsHeld;
if( HOLD_CHECKPOINTS && bAllowHoldCheckpoints ) if( HOLD_CHECKPOINTS && bAllowHoldCheckpoints )
{ {
int iCheckpointsHit = 0; int iCheckpointsHit = 0;
int iCheckpointsMissed = 0; int iCheckpointsMissed = 0;
FOREACH( TrackRowTapNote, vTN, v ) FOREACH( TrackRowTapNote, vTN, v )
{ {
iCheckpointsHit &= v->pTN->HoldResult.iCheckpointsHit; iCheckpointsHit += v->pTN->HoldResult.iCheckpointsHit;
iCheckpointsMissed &= v->pTN->HoldResult.iCheckpointsMissed; iCheckpointsMissed += v->pTN->HoldResult.iCheckpointsMissed;
} }
bLetGoOfHoldNote = iCheckpointsMissed > 0 || iCheckpointsHit == 0;
// TRICKY: If the hold is so short that it has no checkpoints, then mark it as Held if the head was stepped on. // TRICKY: If the hold is so short that it has no checkpoints, then mark it as Held if the head was stepped on.
if( iCheckpointsHit == 0 && iCheckpointsMissed == 0 ) if( iCheckpointsHit == 0 && iCheckpointsMissed == 0 )
bAllowScoreAsHeld = bSteppedOnHead; bLetGoOfHoldNote = !bSteppedOnHead;
else
bAllowScoreAsHeld = iCheckpointsMissed == 0;
} }
else else
{ {
bAllowScoreAsHeld = fLife > 0; bLetGoOfHoldNote = fLife == 0;
} }
if( bInitiatedNote && bAllowScoreAsHeld ) if( bInitiatedNote && !bLetGoOfHoldNote )
{ {
fLife = 1; fLife = 1;
hns = HNS_Held; hns = HNS_Held;