From b8e53a9248d734050bda429b5293994ef7e02f2a Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 19 Dec 2010 15:44:41 -0600
Subject: [PATCH] once more with feeling

---
 src/Player.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Player.cpp b/src/Player.cpp
index 0f2c625615..c473e9ef68 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -2990,8 +2990,8 @@ void Player::HandleHoldCheckpoint( int iRow, int iNumHoldsHeldThisRow, int iNumH
 #endif
 
 	// more warp hackery. -aj
-	if( row >= (unsigned)GAMESTATE->m_iWarpBeginRow &&
-		row <= (unsigned)(GAMESTATE->m_iWarpBeginRow + BeatToNoteRow(GAMESTATE->m_fWarpLength)) )
+	if( iRow >= (unsigned)GAMESTATE->m_iWarpBeginRow &&
+		iRow <= (unsigned)(GAMESTATE->m_iWarpBeginRow + BeatToNoteRow(GAMESTATE->m_fWarpLength)) )
 		return;
 
 	// don't accumulate combo if AutoPlay is on.
@@ -3042,11 +3042,6 @@ 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.