From 6b2b3ec6b14afc3adec16301e2fca6556ab96b77 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 31 May 2005 01:14:30 +0000 Subject: [PATCH] validate m_BackgroundMode instead of asserting on invalid values --- stepmania/src/PrefsManager.cpp | 1 + stepmania/src/PrefsManager.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 61b1f12928..c64ba64c18 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -366,6 +366,7 @@ void PrefsManager::ReadGlobalPrefsFromIni( const IniFile &ini ) m_iSongsPerPlay.Set( clamp(m_iSongsPerPlay.Get(),0,MAX_SONGS_PER_PLAY) ); FOREACH_PlayerNumber( pn ) GetMemoryCardOsMountPoint(pn).Set( FixSlashes(GetMemoryCardOsMountPoint(pn)) ); + m_BackgroundMode.Set( (BackgroundMode)clamp((int)m_BackgroundMode.Get(),0,(int)NUM_BackgroundMode-1) ); } void PrefsManager::SaveGlobalPrefsToDisk() const diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 8e4ab7f287..50a7747fbc 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -34,7 +34,7 @@ public: Preference m_bShowStats; Preference m_bShowBanners; - enum BackgroundMode { BGMODE_OFF, BGMODE_ANIMATIONS, BGMODE_RANDOMMOVIES }; + enum BackgroundMode { BGMODE_OFF, BGMODE_ANIMATIONS, BGMODE_RANDOMMOVIES, NUM_BackgroundMode }; Preference m_BackgroundMode; Preference m_iNumBackgrounds; Preference m_fBGBrightness;