From 3fdfc1c4d47b627d0e8059416161f10cc04e94a8 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 15 Jan 2012 23:39:53 -0600
Subject: [PATCH] [PlayerOptions] Fix a problem with m-mods where you would get
 m200 as the default speed modifier.

---
 Docs/Changelog_sm5.txt | 4 +++-
 src/PlayerOptions.cpp  | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index ff8e1fc995..368305903d 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -5,12 +5,14 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
-StepMania 5.0 alpha ? | 20120???
+StepMania 5.0 alpha 1a | 201201??
 --------------------------------------------------------------------------------
 
 2012/01/15
 ----------
 * [WheelNotifyIcon] Add the NumIconsToShow metric. [Wolfman2000]
+* [PlayerOptions] Fix a problem with m-mods where you would get m200 as
+  the default speed modifier. [AJ]
 
 2012/01/11
 ----------
diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp
index 3be8fb927d..8f15b35dcb 100644
--- a/src/PlayerOptions.cpp
+++ b/src/PlayerOptions.cpp
@@ -61,7 +61,7 @@ void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds )
 
 	APPROACH( fTimeSpacing );
 	APPROACH( fScrollSpeed );
-	//APPROACH( fMaxScrollBPM );
+	APPROACH( fMaxScrollBPM );
 	fapproach( m_fScrollBPM, other.m_fScrollBPM, fDeltaSeconds * other.m_SpeedfScrollBPM*150 );
 	for( int i=0; i<NUM_ACCELS; i++ )
 		APPROACH( fAccels[i] );
@@ -355,8 +355,11 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
 	// XXX: will not properly tween, I don't think.
 	else if( sscanf( sBit, "m%f", &level ) == 1 )
 	{
+		// OpenITG doesn't have this block:
+		/*
 		if( !isfinite(level) || level <= 0.0f )
 			level = 200.0f;
+		*/
 		SET_FLOAT( fMaxScrollBPM )
 		m_fTimeSpacing = 0;
 	}