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

[default -> timing] Bring up to date for test.

Browse Source
This commit is contained in:
Jason Felds
2011-07-17 10:54:42 -04:00
parent e6be564be8 78db196033
commit 3e260fca48
20 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+8 -8
View File
@@ -2965,12 +2965,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
if( iCheckpointFrequencyRows > 0 )
{
// "the first row after the start of the range that lands on a beat"
int iFirstCheckpointInRange = QuantizeUp(m_iFirstUncrossedRow,
iCheckpointFrequencyRows);
int iFirstCheckpointInRange = ((m_iFirstUncrossedRow+iCheckpointFrequencyRows-1)
/iCheckpointFrequencyRows) * iCheckpointFrequencyRows;
// "the last row or first row earlier that lands on a beat"
int iLastCheckpointInRange = QuantizeDown(iLastRowCrossed,
iCheckpointFrequencyRows);
int iLastCheckpointInRange = ((iLastRowCrossed)/iCheckpointFrequencyRows)
* iCheckpointFrequencyRows;
for( int r = iFirstCheckpointInRange; r <= iLastCheckpointInRange; r += iCheckpointFrequencyRows )
{
@@ -2992,12 +2992,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
int iTrack = nIter.Track();
// "the first row after the hold head that lands on a beat"
int iFirstCheckpointOfHold = QuantizeUp(iStartRow,
iCheckpointFrequencyRows);
int iFirstCheckpointOfHold = ((iStartRow+iCheckpointFrequencyRows)/iCheckpointFrequencyRows)
* iCheckpointFrequencyRows;
// "the end row or the first earlier row that lands on a beat"
int iLastCheckpointOfHold = QuantizeDown(iEndRow,
iCheckpointFrequencyRows);
int iLastCheckpointOfHold = ((iEndRow)/iCheckpointFrequencyRows)
* iCheckpointFrequencyRows;
// count the end of the hold as a checkpoint
bool bHoldOverlapsRow = iFirstCheckpointOfHold <= r && r <= iLastCheckpointOfHold;