actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move out of PrefsMan

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-17 01:05:00 +00:00
parent b755a68c27
commit 2fe1e69522
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
-2
View File
@@ -250,8 +250,6 @@ PrefsManager::PrefsManager() :
m_bPickExtraStage ( "PickExtraStage", false ), m_bPickExtraStage ( "PickExtraStage", false ),
m_bComboContinuesBetweenSongs ( "ComboContinuesBetweenSongs", false ), m_bComboContinuesBetweenSongs ( "ComboContinuesBetweenSongs", false ),
m_fLongVerSongSeconds ( "LongVerSongSeconds", 60*2.5f ),
m_fMarathonVerSongSeconds ( "MarathonVerSongSeconds", 60*5.f ),
m_ShowSongOptions ( "ShowSongOptions", YES ), m_ShowSongOptions ( "ShowSongOptions", YES ),
m_bDancePointsForOni ( "DancePointsForOni", false ), m_bDancePointsForOni ( "DancePointsForOni", false ),
m_bPercentageScoring ( "PercentageScoring", false ), m_bPercentageScoring ( "PercentageScoring", false ),
stepmania/src/PrefsManager.h
-2
View File
@@ -133,8 +133,6 @@ public:
Preference<bool> m_bDelayedCreditsReconcile; Preference<bool> m_bDelayedCreditsReconcile;
Preference<bool> m_bPickExtraStage; Preference<bool> m_bPickExtraStage;
Preference<bool> m_bComboContinuesBetweenSongs; Preference<bool> m_bComboContinuesBetweenSongs;
Preference<float> m_fLongVerSongSeconds;
Preference<float> m_fMarathonVerSongSeconds;
enum Maybe { ASK = -1, NO = 0, YES = 1 }; enum Maybe { ASK = -1, NO = 0, YES = 1 };
Preference<Maybe,int> m_ShowSongOptions; Preference<Maybe,int> m_ShowSongOptions;
Preference<bool> m_bDancePointsForOni; Preference<bool> m_bDancePointsForOni;
stepmania/src/Song.cpp
+4 -2
View File
@@ -38,6 +38,8 @@ const int FILE_CACHE_VERSION = 148; // increment this to invalidate cache
const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f; 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() Song::Song()
{ {
@@ -1215,12 +1217,12 @@ float Song::GetStepsSeconds() const
bool Song::IsLong() const bool Song::IsLong() const
{ {
return !IsMarathon() && m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds; return !IsMarathon() && m_fMusicLengthSeconds > g_fLongVerSongSeconds;
} }
bool Song::IsMarathon() const bool Song::IsMarathon() const
{ {
return m_fMusicLengthSeconds >= PREFSMAN->m_fMarathonVerSongSeconds; return m_fMusicLengthSeconds >= g_fMarathonVerSongSeconds;
} }
// lua start // lua start