From 2fe1e69522c32a8b92f72068651e2338ec712334 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 17 Aug 2006 01:05:00 +0000
Subject: [PATCH] move out of PrefsMan

---
 stepmania/src/PrefsManager.cpp | 2 --
 stepmania/src/PrefsManager.h   | 2 --
 stepmania/src/Song.cpp         | 6 ++++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 9e1a0a9c00..567e9cdce7 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -250,8 +250,6 @@ PrefsManager::PrefsManager() :
 	m_bPickExtraStage		( "PickExtraStage",		false ),
 
 	m_bComboContinuesBetweenSongs	( "ComboContinuesBetweenSongs",	false ),
-	m_fLongVerSongSeconds		( "LongVerSongSeconds",		60*2.5f ),
-	m_fMarathonVerSongSeconds	( "MarathonVerSongSeconds",	60*5.f ),
 	m_ShowSongOptions		( "ShowSongOptions",		YES ),
 	m_bDancePointsForOni		( "DancePointsForOni",		false ),
 	m_bPercentageScoring		( "PercentageScoring",		false ),
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 0d70c5d86f..d6142793dd 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -133,8 +133,6 @@ public:
 	Preference<bool>	m_bDelayedCreditsReconcile;
 	Preference<bool>	m_bPickExtraStage;
 	Preference<bool>	m_bComboContinuesBetweenSongs;
-	Preference<float>	m_fLongVerSongSeconds;
-	Preference<float>	m_fMarathonVerSongSeconds;
 	enum Maybe { ASK = -1, NO = 0, YES = 1 };
 	Preference<Maybe,int>		m_ShowSongOptions;
 	Preference<bool>	m_bDancePointsForOni;
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 2f63a5afd5..b5894d21a1 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -38,6 +38,8 @@ const int FILE_CACHE_VERSION = 148;	// increment this to invalidate cache
 
 const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;
 
+static Preference<float>	g_fLongVerSongSeconds( "LongVerSongSeconds",		60*2.5f );
+static Preference<float>	g_fMarathonVerSongSeconds( "MarathonVerSongSeconds",	60*5.f );
 
 Song::Song()
 {
@@ -1215,12 +1217,12 @@ float Song::GetStepsSeconds() const
 
 bool Song::IsLong() const
 {
-	return !IsMarathon() && m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds;
+	return !IsMarathon() && m_fMusicLengthSeconds > g_fLongVerSongSeconds;
 }
 
 bool Song::IsMarathon() const
 {
-	return m_fMusicLengthSeconds >= PREFSMAN->m_fMarathonVerSongSeconds;
+	return m_fMusicLengthSeconds >= g_fMarathonVerSongSeconds;
 }
 
 // lua start