From 9aa003041dbbe2bdbf6249c109c00bc18e144e57 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 30 Mar 2005 04:27:13 +0000 Subject: [PATCH] clip the area highlight rectangle --- stepmania/src/NoteField.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 9a2b62aba9..04ad02b906 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -510,11 +510,23 @@ void NoteField::DrawPrimitives() // Draw marker bars // if( m_iBeginMarker != -1 && m_iEndMarker != -1 ) - DrawAreaHighlight( m_iBeginMarker, m_iEndMarker ); + { + int iBegin = max( m_iBeginMarker, iFirstIndexToDraw ); + int iEnd = min( m_iEndMarker, iLastIndexToDraw ); + DrawAreaHighlight( iBegin, iEnd ); + } else if( m_iBeginMarker != -1 ) - DrawMarkerBar( m_iBeginMarker ); + { + if( m_iBeginMarker >= iFirstIndexToDraw && + m_iBeginMarker <= iLastIndexToDraw ) + DrawMarkerBar( m_iBeginMarker ); + } else if( m_iEndMarker != -1 ) + { + if( m_iEndMarker >= iFirstIndexToDraw && + m_iEndMarker <= iLastIndexToDraw ) DrawMarkerBar( m_iEndMarker ); + } }