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

Revert "a shot in the dark."

Browse Source 
This reverts commit 0bd052ed17.

Broke build.
This commit is contained in:
Devin J. Pohly
2013-06-03 12:46:57 -04:00
parent bd622e91ec
commit 028de88b50
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+7 -2
View File
@@ -1205,6 +1205,10 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
bool bIsHoldingButton = true; bool bIsHoldingButton = true;
FOREACH( TrackRowTapNote, vTN, trtn ) FOREACH( TrackRowTapNote, vTN, trtn )
{
/*if this hold is already done, pretend it's always being pressed.
fixes/masks the phantom hold issue. -FSX*/
if( (iStartRow + trtn->pTN->iDuration) > iSongRow )
{ {
int iTrack = trtn->iTrack; int iTrack = trtn->iTrack;
@@ -1229,6 +1233,7 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
bIsHoldingButton &= INPUTMAPPER->IsBeingPressed( GameI, m_pPlayerState->m_mp ); bIsHoldingButton &= INPUTMAPPER->IsBeingPressed( GameI, m_pPlayerState->m_mp );
} }
} }
}
if( bInitiatedNote && fLife != 0 && bHeadJudged ) if( bInitiatedNote && fLife != 0 && bHeadJudged )
{ {
@@ -1258,11 +1263,11 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
TapNote &tn = *trtn->pTN; TapNote &tn = *trtn->pTN;
// set hold flag so NoteField can do intelligent drawing // set hold flag so NoteField can do intelligent drawing
tn.HoldResult.bHeld = bIsHoldingButton && bInitiatedNote ||; tn.HoldResult.bHeld = bIsHoldingButton && bInitiatedNote;
tn.HoldResult.bActive = bInitiatedNote; tn.HoldResult.bActive = bInitiatedNote;
} }
if( bInitiatedNote && bIsHoldingButton || ((iStartRow + trtn->pTN->iDuration) > iSongRow ) ) if( bInitiatedNote && bIsHoldingButton )
{ {
//LOG->Trace("bInitiatedNote && bIsHoldingButton; Increasing hold life to MAX_HOLD_LIFE"); //LOG->Trace("bInitiatedNote && bIsHoldingButton; Increasing hold life to MAX_HOLD_LIFE");
// Increase life // Increase life