From 15e19d4885b39ea9b7f98f0cedeb5955ff993d88 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 25 Feb 2004 08:40:03 +0000
Subject: [PATCH] fix AddMines places mines that overlap other taps and hold
 heads (Disconnected Mobius expert)

---
 stepmania/src/NoteData.cpp     | 13 +++++++++++++
 stepmania/src/NoteData.h       |  1 +
 stepmania/src/NoteDataUtil.cpp | 16 ++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 9159365c4d..3303d94827 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -141,6 +141,19 @@ bool NoteData::IsRowEmpty( int index ) const
 	return true;
 }
 
+bool NoteData::IsRangeEmpty( int track, int iIndexBegin, int iIndexEnd ) const
+{
+	ASSERT( track<m_iNumTracks );
+	
+	CLAMP( iIndexBegin, 0, GetMaxRow() );
+	CLAMP( iIndexEnd, 0, GetMaxRow() );
+
+	for( int i=iIndexBegin; i<=iIndexEnd; i++ )
+		if( GetTapNoteX(track,i) != TAP_EMPTY )
+			return false;
+	return true;
+}
+
 int NoteData::GetNumTapNonEmptyTracks( int index ) const
 {
 	int iNum = 0;
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 35f36062f7..3a6318c1d7 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -75,6 +75,7 @@ public:
 	void CopyAll( const NoteData* pFrom );
 
 	bool IsRowEmpty( int index ) const;
+	bool IsRangeEmpty( int track, int iIndexBegin, int iIndexEnd ) const;
 	int GetNumTapNonEmptyTracks( int index ) const;
 	int GetFirstNonEmptyTrack( int index ) const;
 	int GetNumTracksWithTap( int index ) const;
diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 4fa1d39bd5..1af4d20e08 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -890,14 +890,22 @@ void NoteDataUtil::AddMines( NoteData &in, float fStartBeat, float fEndBeat )
 	{
 		HoldNote &hn = in.GetHoldNote(i);
 		float fHoldEndBeat = hn.GetEndBeat();
-		int iMineRow = BeatToNoteRow( fHoldEndBeat+0.5f );
+		float fMineBeat = fHoldEndBeat+0.5f;
+		int iMineRow = BeatToNoteRow( fMineBeat );
+
 		if( iMineRow < first_row || iMineRow > last_row )
 			continue;
-		
-		// Add a mine right after the hold end.h
+
+		// Only place a mines if there's not another step nearby
+		int iMineRangeBegin = BeatToNoteRow( fMineBeat-0.5f ) + 1;
+		int iMineRangeEnd = BeatToNoteRow( fMineBeat+0.5f ) - 1;
+		if( !in.IsRangeEmpty(hn.iTrack, iMineRangeBegin, iMineRangeEnd) )
+			continue;
+	
+		// Add a mine right after the hold end.
 		in.SetTapNote(hn.iTrack,iMineRow,TAP_MINE);
 
-		// Convert all other notes in this row to mines.
+		// Convert all notes in this row to mines.
 		for( int t=0; t<in.GetNumTracks(); t++ )
 			if( in.GetTapNote(t,iMineRow) == TAP_TAP )
 				in.SetTapNote(t,iMineRow,TAP_MINE);