From a35fa1416e7f4929bd5ad00a7fb10f94ed853415 Mon Sep 17 00:00:00 2001
From: Kyzentun Keeslala <kyzentun@gmail.com>
Date: Fri, 4 Dec 2015 00:28:22 -0700
Subject: [PATCH] Changed DrawBeatBar to check the M-mod so that smaller beat
 bars are drawn when M-mods are used in edit mode.  Updated changelog.

---
 Docs/Changelog_sm5.txt |  5 +++++
 src/NoteField.cpp      | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 29b47bf398..4bd7b11285 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -4,6 +4,11 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
 from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
+2015/12/04
+----------
+* [NoteField] Changed DrawBeatBar to check the M-mod so that smaller beat
+  bars are drawn when M-mods are used in edit mode. [kyzentun]
+
 2015/11/09
 ----------
 * [Gameplay] BG Brightness is no longer forced to 100% on songs that only
diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index d5e3c18182..a7836695a4 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -375,9 +375,16 @@ void NoteField::DrawBeatBar( const float fBeat, BeatBarType type, int iMeasureIn
 	}
 	else
 	{
-		float fScrollSpeed = m_pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollSpeed;
-		if( m_pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing > 0 )
+		PlayerOptions const& curr_ops= m_pPlayerState->m_PlayerOptions.GetCurrent();
+		float fScrollSpeed = curr_ops.m_fScrollSpeed;
+		if(curr_ops.m_fTimeSpacing > 0)
+		{
 			fScrollSpeed = 4;
+		}
+		else if(curr_ops.m_fMaxScrollBPM != 0)
+		{
+			fScrollSpeed= curr_ops.m_fMaxScrollBPM / m_pPlayerState->m_fReadBPM;
+		}
 		switch( type )
 		{
 			DEFAULT_FAIL( type );