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

m_BackgroundMode -> m_RandomBackgroundMode

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-29 20:04:57 +00:00
parent abf7399207
commit 8c9b57dbae
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1 -1
View File
@@ -3101,7 +3101,7 @@ Line6=conf,UseUnlockSystem
Fallback=ScreenOptionsServiceChild
LineNames=1,2,3,4,5,6
OptionMenuFlags=together;explanations
Line1=conf,BackgroundMode
Line1=conf,RandomBackgroundMode
Line2=conf,BGBrightness
Line3=conf,ShowDanger
Line4=conf,ShowDancingCharacters
stepmania/src/Background.cpp
+3 -3
View File
@@ -424,7 +424,7 @@ bool BackgroundImpl::Layer::CreateBackground( const Song *pSong, const Backgroun
BackgroundDef BackgroundImpl::Layer::CreateRandomBGA( const Song *pSong, const CString &sEffect, deque<BackgroundDef> &RandomBGAnimations )
{
if( PREFSMAN->m_BackgroundMode == PrefsManager::BGMODE_OFF )
if( PREFSMAN->m_RandomBackgroundMode == PrefsManager::BGMODE_OFF )
return BackgroundDef();
if( RandomBGAnimations.empty() )
@@ -510,10 +510,10 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
//
{
CStringArray vsThrowAway, vsNames;
switch( PREFSMAN->m_BackgroundMode )
switch( PREFSMAN->m_RandomBackgroundMode )
{
default:
ASSERT_M( 0, ssprintf("Invalid BackgroundMode: %i", (PrefsManager::BackgroundMode)PREFSMAN->m_BackgroundMode) );
ASSERT_M( 0, ssprintf("Invalid RandomBackgroundMode: %i", PREFSMAN->m_RandomBackgroundMode) );
break;
case PrefsManager::BGMODE_OFF:
break;
stepmania/src/PrefsManager.cpp
+2 -2
View File
@@ -223,7 +223,7 @@ PrefsManager::PrefsManager() :
m_bShowStats ( "ShowStats", TRUE_IF_DEBUG),
m_bShowBanners ( "ShowBanners", true ),
m_BackgroundMode ( "BackgroundMode", BGMODE_ANIMATIONS ),
m_RandomBackgroundMode ( "RandomBackgroundMode", BGMODE_ANIMATIONS ),
m_iNumBackgrounds ( "NumBackgrounds", 8 ),
m_fBGBrightness ( "BGBrightness", 0.8f ),
/* I'd rather get occasional people asking for support for this even though
@@ -443,7 +443,7 @@ void PrefsManager::ReadPrefsFromIni( const IniFile &ini )
// validate
m_iSongsPerPlay.Set( clamp(m_iSongsPerPlay.Get(),0,MAX_SONGS_PER_PLAY) );
m_BackgroundMode.Set( (BackgroundMode)clamp((int)m_BackgroundMode.Get(),0,(int)NUM_BackgroundMode-1) );
m_RandomBackgroundMode.Set( (RandomBackgroundMode)clamp((int)m_RandomBackgroundMode.Get(),0,(int)NUM_RandomBackgroundMode-1) );
FOREACH_CONST_Child( &ini, section )
stepmania/src/PrefsManager.h
+2 -2
View File
@@ -33,8 +33,8 @@ public:
Preference<bool> m_bShowStats;
Preference<bool> m_bShowBanners;
enum BackgroundMode { BGMODE_OFF, BGMODE_ANIMATIONS, BGMODE_RANDOMMOVIES, NUM_BackgroundMode };
Preference<BackgroundMode,int> m_BackgroundMode;
enum RandomBackgroundMode { BGMODE_OFF, BGMODE_ANIMATIONS, BGMODE_RANDOMMOVIES, NUM_RandomBackgroundMode };
Preference<RandomBackgroundMode,int> m_RandomBackgroundMode;
Preference<int> m_iNumBackgrounds;
Preference<float> m_fBGBrightness;
Preference<bool> m_bHiddenSongs;
stepmania/src/ScreenOptionsMasterPrefs.cpp
+1 -1
View File
@@ -525,7 +525,7 @@ static void InitializeConfOptions()
ADD( ConfOption( "FastLoad", MovePref, "OFF","ON" ) );
/* Background options */
ADD( ConfOption( "BackgroundMode", MovePref, "OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES" ) );
ADD( ConfOption( "RandomBackgroundMode", MovePref, "OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES" ) );
ADD( ConfOption( "BGBrightness", BGBrightness, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%" ) );
ADD( ConfOption( "ShowDanger", MovePref, "HIDE","SHOW" ) );
ADD( ConfOption( "ShowDancingCharacters", MovePref, "DEFAULT TO OFF","DEFAULT TO RANDOM","SELECT" ) );