From 797d0d57cfa20c73370d57e06d07b7fc899ccd52 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 11 Jun 2007 16:17:23 +0000
Subject: [PATCH] allow attract screens to ignore SoundVolumeAttract

---
 stepmania/Themes/default/metrics.ini | 1 +
 stepmania/src/ScreenAttract.cpp      | 4 +++-
 stepmania/src/ScreenAttract.h        | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index af32dd0bf6..c614f2afa1 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2689,6 +2689,7 @@ StartScreen=ScreenTitleBranch()
 Fallback="ScreenWithMenuElementsBlank"
 BackGoesToStartScreen=true
 PrevScreen=
+AttractVolume=true
 
 [ScreenWithMenuElementsBlank]
 Fallback="ScreenWithMenuElements"
diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index f4b8cc5f9d..e02b460b3f 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -21,6 +21,7 @@ REGISTER_SCREEN_CLASS( ScreenAttract );
 void ScreenAttract::Init()
 {
 	RESET_GAME_STATE.Load( m_sName, "ResetGameState" );
+	ATTRACT_VOLUME.Load( m_sName, "AttractVolume" );
 	ScreenWithMenuElements::Init();
 }
 
@@ -30,7 +31,7 @@ void ScreenAttract::BeginScreen()
 		GAMESTATE->Reset();
 
 	GAMESTATE->VisitAttractScreen( m_sName );
-	ScreenAttract::SetAttractVolume( true );
+	ScreenAttract::SetAttractVolume( ATTRACT_VOLUME );
 
 	ScreenWithMenuElements::BeginScreen();
 }
@@ -46,6 +47,7 @@ void ScreenAttract::Input( const InputEventPlus &input )
 
 void ScreenAttract::SetAttractVolume( bool bInAttract )
 {
+	LOG->Trace( "SetAttractVolume %i", bInAttract );
 	if( bInAttract )
 	{
 		if( GAMESTATE->IsTimeToPlayAttractSounds() )
diff --git a/stepmania/src/ScreenAttract.h b/stepmania/src/ScreenAttract.h
index 76311bdeef..c4912f0734 100644
--- a/stepmania/src/ScreenAttract.h
+++ b/stepmania/src/ScreenAttract.h
@@ -30,6 +30,7 @@ public:
 protected:
 	virtual void StartPlayingMusic();
 	ThemeMetric<bool> RESET_GAME_STATE;
+	ThemeMetric<bool> ATTRACT_VOLUME;
 };