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

Blind modifier fix - code improvement as suggested

Browse Source
This commit is contained in:
Mike Hawkins
2008-05-30 02:58:25 +00:00
parent 34913d4095
commit 81bb2aeb93
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+4
View File
@@ -2066,6 +2066,9 @@ done_checking_hopo:
// XXX This is the wrong combo for shared players. STATSMAN->m_CurStageStats.m_Player[pn] might work but could be wrong. // XXX This is the wrong combo for shared players. STATSMAN->m_CurStageStats.m_Player[pn] might work but could be wrong.
const bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo > int(BRIGHT_GHOST_COMBO_THRESHOLD); const bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo > int(BRIGHT_GHOST_COMBO_THRESHOLD);
if( m_pNoteField ) if( m_pNoteField )
<<<<<<< .mine
m_pNoteField->DidTapNote( col, bBlind? TNS_W1:score, bBright );
=======
{ {
/* We need to make sure all notes have the same ghost row score if blind is on, /* We need to make sure all notes have the same ghost row score if blind is on,
* otherwise you can still tell what the score on the note was if the flash is * otherwise you can still tell what the score on the note was if the flash is
@@ -2075,6 +2078,7 @@ done_checking_hopo:
else else
m_pNoteField->DidTapNote( col, score, bBright ); m_pNoteField->DidTapNote( col, score, bBright );
} }
>>>>>>> .r27467
if( score >= TNS_W3 || bBlind ) if( score >= TNS_W3 || bBlind )
HideNote( col, iRowOfOverlappingNoteOrRow ); HideNote( col, iRowOfOverlappingNoteOrRow );
} }