From 76565b269085c9b79320b230a9c3aec2fda62504 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 19 Dec 2010 15:42:27 -0600
Subject: [PATCH] more warp hackery.

---
 src/Player.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Player.cpp b/src/Player.cpp
index 32d1f51754..0f2c625615 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -2528,15 +2528,15 @@ void Player::UpdateJudgedRows()
 		{
 			int iRow = iter.Row();
 
+			// if row is within a warp section, ignore it. -aj
+			if( iRow >= GAMESTATE->m_iWarpBeginRow &&
+				iRow <= (GAMESTATE->m_iWarpBeginRow + BeatToNoteRow(GAMESTATE->m_fWarpLength)) )
+				continue;
+
 			if( iLastSeenRow != iRow )
 			{
 				iLastSeenRow = iRow;
 
-				// if row is within a warp section, ignore it. -aj
-				if( iRow >= GAMESTATE->m_iWarpBeginRow &&
-					iRow <= (GAMESTATE->m_iWarpBeginRow + BeatToNoteRow(GAMESTATE->m_fWarpLength)) )
-					continue;
-
 				// crossed a nonempty row
 				if( !NoteDataWithScoring::IsRowCompletelyJudged(m_NoteData, iRow) )
 				{
@@ -2989,6 +2989,11 @@ void Player::HandleHoldCheckpoint( int iRow, int iNumHoldsHeldThisRow, int iNumH
 	bNoCheating = false;
 #endif
 
+	// more warp hackery. -aj
+	if( row >= (unsigned)GAMESTATE->m_iWarpBeginRow &&
+		row <= (unsigned)(GAMESTATE->m_iWarpBeginRow + BeatToNoteRow(GAMESTATE->m_fWarpLength)) )
+		return;
+
 	// don't accumulate combo if AutoPlay is on.
 	if( bNoCheating && m_pPlayerState->m_PlayerController == PC_AUTOPLAY )
 		return;
@@ -3037,6 +3042,11 @@ void Player::HandleHoldScore( const TapNote &tn )
 	bNoCheating = false;
 #endif
 
+	// more warp hackery. -aj
+	if( row >= (unsigned)GAMESTATE->m_iWarpBeginRow &&
+		row <= (unsigned)(GAMESTATE->m_iWarpBeginRow + BeatToNoteRow(GAMESTATE->m_fWarpLength)) )
+		return;
+
 	if( GAMESTATE->m_bDemonstrationOrJukebox )
 		bNoCheating = false;
 	// don't accumulate points if AutoPlay is on.