From 7e59c6094475044818f5a91b0c163665807f34a1 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Fri, 25 Mar 2011 21:31:47 -0400
Subject: [PATCH] [warps] Ignore all mines during a warp.

---
 src/Player.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Player.cpp b/src/Player.cpp
index 194676330c..8f727a35d7 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -2040,7 +2040,9 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b
 			{
 			case TapNote::mine:
 				// Stepped too close to mine?
-				if( !bRelease && ( REQUIRE_STEP_ON_MINES == !bHeld ) && fSecondsFromExact <= GetWindowSeconds(TW_Mine) )
+				if( !bRelease && ( REQUIRE_STEP_ON_MINES == !bHeld ) && 
+				   fSecondsFromExact <= GetWindowSeconds(TW_Mine) &&
+				   !GAMESTATE->m_pCurSong->m_Timing.IsWarpAtRow(iSongRow) )
 					score = TNS_HitMine;
 				break;