From 2d5f2e089cc7037498f4e4bf46001f444e3676b3 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 31 Aug 2005 23:23:24 +0000
Subject: [PATCH] play sounds with Sound, not with hardcoded stuff

---
 stepmania/src/ScreenEvaluation.cpp | 22 +---------------------
 stepmania/src/ScreenEvaluation.h   |  3 ---
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 583c291fde..028caacf42 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -77,7 +77,6 @@ static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
 
 AutoScreenMessage( SM_PlayCheer )
 AutoScreenMessage( SM_AddBonus )
-AutoScreenMessage( SM_PlayPassSound )
 
 
 REGISTER_SCREEN_CLASS( ScreenEvaluation );
@@ -262,17 +261,7 @@ void ScreenEvaluation::Init()
  
 
 	//
-	// load pass/fail sound
-	//
-	if( m_bFailed )
- 		m_sndPassFail.Load( THEME->GetPathS(m_sName, "failed") );
-	else
-		m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") );
-	this->PostScreenMessage( SM_PlayPassSound, 0 );
-	this->PostScreenMessage( SM_PlayPassSound, m_bFailed? FAILED_SOUND_TIME:PASSED_SOUND_TIME );
-
-	//
-	// load other sounds
+	// load sounds
 	//
 	m_soundStart.Load( THEME->GetPathS(m_sName,"start") );
 
@@ -1217,15 +1206,6 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
 	{
 		EndScreen();
 	}
-	else if( SM == SM_PlayPassSound )
-	{
-		m_sndPassFail.Play();
-	}
-	else if( SM == SM_GoToNextScreen )
-	{
-		if(	m_sndPassFail.IsPlaying() )
-			m_sndPassFail.Stop();
-	}
 	else if( SM == SM_PlayCheer )
 	{
 		SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") );
diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h
index 9e55cda1c6..44d94f6c06 100644
--- a/stepmania/src/ScreenEvaluation.h
+++ b/stepmania/src/ScreenEvaluation.h
@@ -120,9 +120,6 @@ protected:
 
 	RageSound	m_soundStart;	// sound played if the player passes or fails
 
-	// sound effects for other gametypes
-	RageSound	m_sndPassFail;	// sound played if the player passes or fails
-
 	HighScore m_HighScore[NUM_PLAYERS];
 	bool m_bSavedScreenshot[NUM_PLAYERS];
 };