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

Revert "Don't send HNS_Held / HNS_LetGo when using checkpoint holds"

Browse Source 
This reverts commit 18a0c818cd.

Those events are used for more than just life and scoring.
This commit is contained in:
Ben "root" Anderson
2013-12-11 18:53:11 -06:00
parent 2eea7aa06e
commit b4cfbf029c
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+24 -20
View File
@@ -1412,35 +1412,39 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
else else
LOG->Trace("did not let go of hold note :D"); LOG->Trace("did not let go of hold note :D");
*/ */
}
if( bInitiatedNote ) if( bInitiatedNote )
{
if(!bLetGoOfHoldNote)
{ {
if(!bLetGoOfHoldNote) //LOG->Trace("initiated note and didn't let go");
fLife = 1; // xxx: should be MAX_HOLD_LIFE instead? -aj
hns = HNS_Held;
bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD;
if( m_pNoteField )
{ {
//LOG->Trace("initiated note and didn't let go"); FOREACH( TrackRowTapNote, vTN, trtn )
fLife = 1; // xxx: should be MAX_HOLD_LIFE instead? -aj
hns = HNS_Held;
bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD;
if( m_pNoteField )
{ {
FOREACH( TrackRowTapNote, vTN, trtn ) int iTrack = trtn->iTrack;
{ m_pNoteField->DidHoldNote( iTrack, HNS_Held, bBright ); // bright ghost flash
int iTrack = trtn->iTrack;
m_pNoteField->DidHoldNote( iTrack, HNS_Held, bBright ); // bright ghost flash
}
} }
} }
}
else else
{
//LOG->Trace("initiated note and let go :(");
}
}
else if( SCORE_MISSED_HOLDS_AND_ROLLS )
{ {
hns = HNS_LetGo; //LOG->Trace("initiated note and let go :(");
} }
} // hns == HNS_None initially and so it may remain }
else if( SCORE_MISSED_HOLDS_AND_ROLLS )
{
hns = HNS_LetGo;
}
else
{
hns = HNS_None;
}
} }
float fLifeFraction = fLife / MAX_HOLD_LIFE; float fLifeFraction = fLife / MAX_HOLD_LIFE;