diff --git a/src/SongOptions.cpp b/src/SongOptions.cpp
index 6580f729a0..556bc33a83 100644
--- a/src/SongOptions.cpp
+++ b/src/SongOptions.cpp
@@ -1,263 +1,263 @@
-#include "global.h"
-#include "SongOptions.h"
-#include "RageUtil.h"
-#include "GameState.h"
-#include "CommonMetrics.h"
-
-void SongOptions::Init() 
-{
-	m_LifeType = LIFE_BAR;
-	m_DrainType = DRAIN_NORMAL;
-	m_iBatteryLives = 4;
-	m_bAssistClap = false;
-	m_bAssistMetronome = false;
-	m_fMusicRate = 1.0f;
-	m_SpeedfMusicRate = 1.0f;
-	m_fHaste = 0.0f;
-	m_SpeedfHaste = 1.0f;
-	m_AutosyncType = AUTOSYNC_OFF;
-	m_SoundEffectType = SOUNDEFFECT_OFF;
-	m_bStaticBackground = false;
-	m_bRandomBGOnly = false;
-	m_bSaveScore = true;
-	m_bSaveReplay = false; // don't save replays by default?
-}
-
-void SongOptions::Approach( const SongOptions& other, float fDeltaSeconds )
-{
-#define APPROACH( opt ) \
-	fapproach( m_ ## opt, other.m_ ## opt, fDeltaSeconds * other.m_Speed ## opt );
-#define DO_COPY( x ) \
-	x = other.x;
-
-	DO_COPY( m_LifeType );
-	DO_COPY( m_DrainType );
-	DO_COPY( m_iBatteryLives );
-	APPROACH( fMusicRate );
-	APPROACH( fHaste );
-	DO_COPY( m_bAssistClap );
-	DO_COPY( m_bAssistMetronome );
-	DO_COPY( m_AutosyncType );
-	DO_COPY( m_SoundEffectType );
-	DO_COPY( m_bStaticBackground );
-	DO_COPY( m_bRandomBGOnly );
-	DO_COPY( m_bSaveScore );
-	DO_COPY( m_bSaveReplay );
-#undef APPROACH
-#undef DO_COPY
-}
-
-static void AddPart( vector<RString> &AddTo, float level, RString name )
-{
-	if( level == 0 )
-		return;
-
-	const RString LevelStr = (level == 1)? RString(""): ssprintf( "%ld%% ", lrintf(level*100) );
-
-	AddTo.push_back( LevelStr + name );
-}
-
-void SongOptions::GetMods( vector<RString> &AddTo ) const
-{
-	switch( m_LifeType )
-	{
-	case LIFE_BAR:		
-		switch( m_DrainType )
-		{
-		case DRAIN_NORMAL:						break;
-		case DRAIN_NO_RECOVER:		AddTo.push_back("NoRecover");	break;
-		case DRAIN_SUDDEN_DEATH:	AddTo.push_back("SuddenDeath");	break;
-		}
-		break;
-	case LIFE_BATTERY:
-		AddTo.push_back( ssprintf( "%dLives", m_iBatteryLives ) );
-		break;
-	case LIFE_TIME:
-		AddTo.push_back( "LifeTime" );
-		break;
-	default:
-		FAIL_M(ssprintf("Invalid LifeType: %i", m_LifeType));
-	}
-
-
-	if( m_fMusicRate != 1 )
-	{
-		RString s = ssprintf( "%2.2f", m_fMusicRate );
-		if( s[s.size()-1] == '0' )
-			s.erase( s.size()-1 );
-		AddTo.push_back( s + "xMusic" );
-	}
-
-	AddPart( AddTo, m_fHaste,	"Haste" );
-
-	switch( m_AutosyncType )
-	{
-	case AUTOSYNC_OFF:	                                	break;
-	case AUTOSYNC_SONG:	AddTo.push_back("AutosyncSong");	break;
-	case AUTOSYNC_MACHINE:	AddTo.push_back("AutosyncMachine");	break;
-	case AUTOSYNC_TEMPO:	AddTo.push_back("AutosyncTempo");	break;
-	default:
-		FAIL_M(ssprintf("Invalid autosync type: %i", m_AutosyncType));
-	}
-
-	switch( m_SoundEffectType )
-	{
-	case SOUNDEFFECT_OFF:	                                	break;
-	case SOUNDEFFECT_SPEED:	AddTo.push_back("EffectSpeed");		break;
-	case SOUNDEFFECT_PITCH:	AddTo.push_back("EffectPitch");		break;
-	default:
-		FAIL_M(ssprintf("Invalid sound effect type: %i", m_SoundEffectType));
-	}
-
-	if( m_bAssistClap )
-		AddTo.push_back( "Clap" );
-	if( m_bAssistMetronome )
-		AddTo.push_back( "Metronome" );
-
-	if( m_bStaticBackground )
-		AddTo.push_back( "StaticBG" );
-	if( m_bRandomBGOnly )
-		AddTo.push_back( "RandomBG" );
-}
-
-void SongOptions::GetLocalizedMods( vector<RString> &v ) const
-{
-	GetMods( v );
-	FOREACH( RString, v, s )
-	{
-		*s = CommonMetrics::LocalizeOptionItem( *s, true );
-	}
-}
-
-RString SongOptions::GetString() const
-{
-	vector<RString> v;
-	GetMods( v );
-	return join( ", ", v );
-}
-
-RString SongOptions::GetLocalizedString() const
-{
-	vector<RString> v;
-	GetLocalizedMods( v );
-	return join( ", ", v );
-}
-
-
-/* Options are added to the current settings; call Init() beforehand if
- * you don't want this. */
-void SongOptions::FromString( const RString &sMultipleMods )
-{
-	RString sTemp = sMultipleMods;
-	vector<RString> vs;
-	split( sTemp, ",", vs, true );
-	RString sThrowAway;
-	FOREACH( RString, vs, s )
-	{
-		FromOneModString( *s, sThrowAway );
-	}
-}
-
-bool SongOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut )
-{
-	RString sBit = sOneMod;
-	sBit.MakeLower();
-	Trim( sBit );
-
-	Regex mult("^([0-9]+(\\.[0-9]+)?)xmusic$");
-	vector<RString> matches;
-	if( mult.Compare(sBit, matches) )
-	{
-		m_fMusicRate = StringToFloat( matches[0] );
-		return true;
-	}
-
-	matches.clear();
-	Regex lives("^([0-9]+) ?(lives|life)$");
-	if( lives.Compare(sBit, matches) )
-	{
-		m_iBatteryLives = StringToInt( matches[0] );
-		return true;
-	}
-
-	vector<RString> asParts;
-	split( sBit, " ", asParts, true );
-	bool on = true;
-	if( asParts.size() > 1 )
-	{
-		sBit = asParts[1];
-		if( asParts[0] == "no" )
-			on = false;
-	}
-
-	if(	 sBit == "norecover" )				m_DrainType = DRAIN_NO_RECOVER;
-	else if( sBit == "suddendeath" || sBit == "death" )	m_DrainType = DRAIN_SUDDEN_DEATH;
-	else if( sBit == "power-drop" )				m_DrainType = DRAIN_NO_RECOVER;
-	else if( sBit == "normal-drain" )			m_DrainType = DRAIN_NORMAL;
-
-	else if( sBit == "clap" )				m_bAssistClap = on;
-	else if( sBit == "metronome" )				m_bAssistMetronome = on;
-	else if( sBit == "autosync" || sBit == "autosyncsong" )	m_AutosyncType = on ? AUTOSYNC_SONG : AUTOSYNC_OFF;
-	else if( sBit == "autosyncmachine" )			m_AutosyncType = on ? AUTOSYNC_MACHINE : AUTOSYNC_OFF; 
-	else if( sBit == "autosynctempo" )			m_AutosyncType = on ? AUTOSYNC_TEMPO : AUTOSYNC_OFF;
-	else if( sBit == "effect" && !on )			m_SoundEffectType = SOUNDEFFECT_OFF;
-	else if( sBit == "effectspeed" )			m_SoundEffectType = on ? SOUNDEFFECT_SPEED : SOUNDEFFECT_OFF;
-	else if( sBit == "effectpitch" )			m_SoundEffectType = on ? SOUNDEFFECT_PITCH : SOUNDEFFECT_OFF;
-	else if( sBit == "staticbg" )				m_bStaticBackground = on;
-	else if( sBit == "randombg" )				m_bRandomBGOnly = on;
-	else if( sBit == "savescore" )				m_bSaveScore = on;
-	else if( sBit == "savereplay" )			m_bSaveReplay = on;
-	else if( sBit == "bar" )				m_LifeType = LIFE_BAR;
-	else if( sBit == "battery" )				m_LifeType = LIFE_BATTERY;
-	else if( sBit == "lifetime" )				m_LifeType = LIFE_TIME;
-	else if( sBit == "haste" )				m_fHaste = on? 1.0f:0.0f;
-	else
-		return false;
-
-	return true;
-}
-
-bool SongOptions::operator==( const SongOptions &other ) const
-{
-#define COMPARE(x) { if( x != other.x ) return false; }
-	COMPARE( m_LifeType );
-	COMPARE( m_DrainType );
-	COMPARE( m_iBatteryLives );
-	COMPARE( m_fMusicRate );
-	COMPARE( m_fHaste );
-	COMPARE( m_bAssistClap );
-	COMPARE( m_bAssistMetronome );
-	COMPARE( m_AutosyncType );
-	COMPARE( m_SoundEffectType );
-	COMPARE( m_bStaticBackground );
-	COMPARE( m_bRandomBGOnly );
-	COMPARE( m_bSaveScore );
-	COMPARE( m_bSaveReplay );
-#undef COMPARE
-	return true;
-}
-
-/*
- * (c) 2001-2004 Chris Danford, Glenn Maynard
- * All rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons to
- * whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
+#include "global.h"
+#include "SongOptions.h"
+#include "RageUtil.h"
+#include "GameState.h"
+#include "CommonMetrics.h"
+
+void SongOptions::Init() 
+{
+	m_LifeType = LIFE_BAR;
+	m_DrainType = DRAIN_NORMAL;
+	m_iBatteryLives = 4;
+	m_bAssistClap = false;
+	m_bAssistMetronome = false;
+	m_fMusicRate = 1.0f;
+	m_SpeedfMusicRate = 1.0f;
+	m_fHaste = 0.0f;
+	m_SpeedfHaste = 1.0f;
+	m_AutosyncType = AUTOSYNC_OFF;
+	m_SoundEffectType = SOUNDEFFECT_OFF;
+	m_bStaticBackground = false;
+	m_bRandomBGOnly = false;
+	m_bSaveScore = true;
+	m_bSaveReplay = false; // don't save replays by default?
+}
+
+void SongOptions::Approach( const SongOptions& other, float fDeltaSeconds )
+{
+#define APPROACH( opt ) \
+	fapproach( m_ ## opt, other.m_ ## opt, fDeltaSeconds * other.m_Speed ## opt );
+#define DO_COPY( x ) \
+	x = other.x;
+
+	DO_COPY( m_LifeType );
+	DO_COPY( m_DrainType );
+	DO_COPY( m_iBatteryLives );
+	APPROACH( fMusicRate );
+	APPROACH( fHaste );
+	DO_COPY( m_bAssistClap );
+	DO_COPY( m_bAssistMetronome );
+	DO_COPY( m_AutosyncType );
+	DO_COPY( m_SoundEffectType );
+	DO_COPY( m_bStaticBackground );
+	DO_COPY( m_bRandomBGOnly );
+	DO_COPY( m_bSaveScore );
+	DO_COPY( m_bSaveReplay );
+#undef APPROACH
+#undef DO_COPY
+}
+
+static void AddPart( vector<RString> &AddTo, float level, RString name )
+{
+	if( level == 0 )
+		return;
+
+	const RString LevelStr = (level == 1)? RString(""): ssprintf( "%ld%% ", lrintf(level*100) );
+
+	AddTo.push_back( LevelStr + name );
+}
+
+void SongOptions::GetMods( vector<RString> &AddTo ) const
+{
+	switch( m_LifeType )
+	{
+	case LIFE_BAR:		
+		switch( m_DrainType )
+		{
+		case DRAIN_NORMAL:						break;
+		case DRAIN_NO_RECOVER:		AddTo.push_back("NoRecover");	break;
+		case DRAIN_SUDDEN_DEATH:	AddTo.push_back("SuddenDeath");	break;
+		}
+		break;
+	case LIFE_BATTERY:
+		AddTo.push_back( ssprintf( "%dLives", m_iBatteryLives ) );
+		break;
+	case LIFE_TIME:
+		AddTo.push_back( "LifeTime" );
+		break;
+	default:
+		FAIL_M(ssprintf("Invalid LifeType: %i", m_LifeType));
+	}
+
+
+	if( m_fMusicRate != 1 )
+	{
+		RString s = ssprintf( "%2.2f", m_fMusicRate );
+		if( s[s.size()-1] == '0' )
+			s.erase( s.size()-1 );
+		AddTo.push_back( s + "xMusic" );
+	}
+
+	AddPart( AddTo, m_fHaste,	"Haste" );
+
+	switch( m_AutosyncType )
+	{
+	case AUTOSYNC_OFF:	                                	break;
+	case AUTOSYNC_SONG:	AddTo.push_back("AutosyncSong");	break;
+	case AUTOSYNC_MACHINE:	AddTo.push_back("AutosyncMachine");	break;
+	case AUTOSYNC_TEMPO:	AddTo.push_back("AutosyncTempo");	break;
+	default:
+		FAIL_M(ssprintf("Invalid autosync type: %i", m_AutosyncType));
+	}
+
+	switch( m_SoundEffectType )
+	{
+	case SOUNDEFFECT_OFF:	                                	break;
+	case SOUNDEFFECT_SPEED:	AddTo.push_back("EffectSpeed");		break;
+	case SOUNDEFFECT_PITCH:	AddTo.push_back("EffectPitch");		break;
+	default:
+		FAIL_M(ssprintf("Invalid sound effect type: %i", m_SoundEffectType));
+	}
+
+	if( m_bAssistClap )
+		AddTo.push_back( "Clap" );
+	if( m_bAssistMetronome )
+		AddTo.push_back( "Metronome" );
+
+	if( m_bStaticBackground )
+		AddTo.push_back( "StaticBG" );
+	if( m_bRandomBGOnly )
+		AddTo.push_back( "RandomBG" );
+}
+
+void SongOptions::GetLocalizedMods( vector<RString> &v ) const
+{
+	GetMods( v );
+	for (RString &s : v)
+	{
+		s = CommonMetrics::LocalizeOptionItem( s, true );
+	}
+}
+
+RString SongOptions::GetString() const
+{
+	vector<RString> v;
+	GetMods( v );
+	return join( ", ", v );
+}
+
+RString SongOptions::GetLocalizedString() const
+{
+	vector<RString> v;
+	GetLocalizedMods( v );
+	return join( ", ", v );
+}
+
+
+/* Options are added to the current settings; call Init() beforehand if
+ * you don't want this. */
+void SongOptions::FromString( const RString &sMultipleMods )
+{
+	RString sTemp = sMultipleMods;
+	vector<RString> vs;
+	split( sTemp, ",", vs, true );
+	RString sThrowAway;
+	for (RString &s : vs)
+	{
+		FromOneModString( s, sThrowAway );
+	}
+}
+
+bool SongOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut )
+{
+	RString sBit = sOneMod;
+	sBit.MakeLower();
+	Trim( sBit );
+
+	Regex mult("^([0-9]+(\\.[0-9]+)?)xmusic$");
+	vector<RString> matches;
+	if( mult.Compare(sBit, matches) )
+	{
+		m_fMusicRate = StringToFloat( matches[0] );
+		return true;
+	}
+
+	matches.clear();
+	Regex lives("^([0-9]+) ?(lives|life)$");
+	if( lives.Compare(sBit, matches) )
+	{
+		m_iBatteryLives = StringToInt( matches[0] );
+		return true;
+	}
+
+	vector<RString> asParts;
+	split( sBit, " ", asParts, true );
+	bool on = true;
+	if( asParts.size() > 1 )
+	{
+		sBit = asParts[1];
+		if( asParts[0] == "no" )
+			on = false;
+	}
+
+	if(	 sBit == "norecover" )				m_DrainType = DRAIN_NO_RECOVER;
+	else if( sBit == "suddendeath" || sBit == "death" )	m_DrainType = DRAIN_SUDDEN_DEATH;
+	else if( sBit == "power-drop" )				m_DrainType = DRAIN_NO_RECOVER;
+	else if( sBit == "normal-drain" )			m_DrainType = DRAIN_NORMAL;
+
+	else if( sBit == "clap" )				m_bAssistClap = on;
+	else if( sBit == "metronome" )				m_bAssistMetronome = on;
+	else if( sBit == "autosync" || sBit == "autosyncsong" )	m_AutosyncType = on ? AUTOSYNC_SONG : AUTOSYNC_OFF;
+	else if( sBit == "autosyncmachine" )			m_AutosyncType = on ? AUTOSYNC_MACHINE : AUTOSYNC_OFF; 
+	else if( sBit == "autosynctempo" )			m_AutosyncType = on ? AUTOSYNC_TEMPO : AUTOSYNC_OFF;
+	else if( sBit == "effect" && !on )			m_SoundEffectType = SOUNDEFFECT_OFF;
+	else if( sBit == "effectspeed" )			m_SoundEffectType = on ? SOUNDEFFECT_SPEED : SOUNDEFFECT_OFF;
+	else if( sBit == "effectpitch" )			m_SoundEffectType = on ? SOUNDEFFECT_PITCH : SOUNDEFFECT_OFF;
+	else if( sBit == "staticbg" )				m_bStaticBackground = on;
+	else if( sBit == "randombg" )				m_bRandomBGOnly = on;
+	else if( sBit == "savescore" )				m_bSaveScore = on;
+	else if( sBit == "savereplay" )			m_bSaveReplay = on;
+	else if( sBit == "bar" )				m_LifeType = LIFE_BAR;
+	else if( sBit == "battery" )				m_LifeType = LIFE_BATTERY;
+	else if( sBit == "lifetime" )				m_LifeType = LIFE_TIME;
+	else if( sBit == "haste" )				m_fHaste = on? 1.0f:0.0f;
+	else
+		return false;
+
+	return true;
+}
+
+bool SongOptions::operator==( const SongOptions &other ) const
+{
+#define COMPARE(x) { if( x != other.x ) return false; }
+	COMPARE( m_LifeType );
+	COMPARE( m_DrainType );
+	COMPARE( m_iBatteryLives );
+	COMPARE( m_fMusicRate );
+	COMPARE( m_fHaste );
+	COMPARE( m_bAssistClap );
+	COMPARE( m_bAssistMetronome );
+	COMPARE( m_AutosyncType );
+	COMPARE( m_SoundEffectType );
+	COMPARE( m_bStaticBackground );
+	COMPARE( m_bRandomBGOnly );
+	COMPARE( m_bSaveScore );
+	COMPARE( m_bSaveReplay );
+#undef COMPARE
+	return true;
+}
+
+/*
+ * (c) 2001-2004 Chris Danford, Glenn Maynard
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */