add option for silent attract
This commit is contained in:
@@ -2403,15 +2403,17 @@ HelpText=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options::
|
||||
MasterVolume=
|
||||
PreloadSounds=If YES, preload most sounds in advance. This increases load times,::and should normally be left OFF.
|
||||
ResamplingQuality=Advanced: Select the resampling quality to use.
|
||||
AttractSound=Set to ON to play sound during the attract screens.::Set to OFF to mute sounds durring attract.
|
||||
StyleIcon=0
|
||||
TimerSeconds=0
|
||||
|
||||
PrevScreen=ScreenOptionsMenu@ScreenOptionsMaster
|
||||
NextScreen=ScreenOptionsMenu@ScreenOptionsMaster
|
||||
|
||||
OptionMenuFlags=rows,2;together;explanations
|
||||
OptionMenuFlags=rows,3;together;explanations
|
||||
Line1=conf,PreloadSounds
|
||||
Line2=conf,ResamplingQuality
|
||||
Line3=conf,AttractSound
|
||||
|
||||
[ScreenIntroMovie]
|
||||
NextScreen=ScreenDemonstration
|
||||
|
||||
@@ -138,6 +138,8 @@ PrefsManager::PrefsManager()
|
||||
m_fCenterImageScaleX = 1;
|
||||
m_fCenterImageScaleY = 1;
|
||||
|
||||
m_bAttractSound = true;
|
||||
|
||||
|
||||
/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
|
||||
#ifdef _XBOX
|
||||
@@ -297,6 +299,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
|
||||
ini.GetValue( "Options", "CenterImageTranslateY", m_iCenterImageTranslateY );
|
||||
ini.GetValue( "Options", "CenterImageScaleX", m_fCenterImageScaleX );
|
||||
ini.GetValue( "Options", "CenterImageScaleY", m_fCenterImageScaleY );
|
||||
ini.GetValue( "Options", "AttractSound", m_bAttractSound );
|
||||
|
||||
CString sAdditionalSongFolders;
|
||||
if( ini.GetValue( "Options", "AdditionalSongFolders", sAdditionalSongFolders ) )
|
||||
@@ -418,6 +421,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
|
||||
ini.SetValue( "Options", "CenterImageTranslateY", m_iCenterImageTranslateY );
|
||||
ini.SetValue( "Options", "CenterImageScaleX", m_fCenterImageScaleX );
|
||||
ini.SetValue( "Options", "CenterImageScaleY", m_fCenterImageScaleY );
|
||||
ini.SetValue( "Options", "AttractSound", m_bAttractSound );
|
||||
|
||||
/* Only write these if they aren't the default. This ensures that we can change
|
||||
* the default and have it take effect for everyone (except people who
|
||||
|
||||
@@ -104,6 +104,7 @@ public:
|
||||
int m_iCenterImageTranslateY;
|
||||
float m_fCenterImageScaleX;
|
||||
float m_fCenterImageScaleY;
|
||||
bool m_bAttractSound;
|
||||
|
||||
// course ranking
|
||||
enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK } m_iCourseSortOrder;
|
||||
|
||||
@@ -51,7 +51,8 @@ ScreenAttract::ScreenAttract( CString sClassName ) : Screen( sClassName )
|
||||
|
||||
m_soundStart.Load( THEME->GetPathToS("Common start") );
|
||||
|
||||
SOUND->PlayMusic( THEME->GetPathToS(m_sName + " music") );
|
||||
if( PREFSMAN->m_bAttractSound )
|
||||
SOUND->PlayMusic( THEME->GetPathToS(m_sName + " music") );
|
||||
|
||||
GAMESTATE->m_bPlayersCanJoin = true;
|
||||
|
||||
|
||||
@@ -373,6 +373,7 @@ static void RefreshRate( int &sel, bool ToSel, const CStringArray &choices )
|
||||
/* Sound options */
|
||||
MOVE( PreloadSounds, PREFSMAN->m_bSoundPreloadAll );
|
||||
MOVE( ResamplingQuality, PREFSMAN->m_iSoundResampleQuality );
|
||||
MOVE( AttractSound, PREFSMAN->m_bAttractSound );
|
||||
|
||||
|
||||
static const ConfOption g_ConfOptions[] =
|
||||
@@ -454,7 +455,8 @@ static const ConfOption g_ConfOptions[] =
|
||||
/* Sound options */
|
||||
ConfOption( "Preload\nSounds", PreloadSounds, "NO","YES" ),
|
||||
ConfOption( "Resampling\nQuality", ResamplingQuality, "FAST","NORMAL","HIGH QUALITY" ),
|
||||
ConfOption( "", NULL )
|
||||
ConfOption( "Attract\nSound", AttractSound, "OFF","ON" ),
|
||||
ConfOption( "", NULL ) // end marker
|
||||
};
|
||||
|
||||
/* Get a mask of effects to apply if the given option changes. */
|
||||
|
||||
Reference in New Issue
Block a user