From 563f57ee0d79dfb7fa59b7ddb57c43b63f0a9a16 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 12 May 2003 01:04:28 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenEvaluation.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 03277d8077..309dfc6ec9 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -820,14 +820,16 @@ void ScreenEvaluation::Update( float fDeltaTime ) if(RageTimer::GetTimeSinceStart() < m_fScreenCreateTime + m_TimeToPlayJudgeSound[l]) continue; - RageColor c; - c.a = 1; - if((SOUND_ON_FULL_ALPHA && (m_sprJudgeLabels[l].GetDiffuse().a == c.a || m_textJudgeNumbers[l][PLAYER_1].GetDiffuse().a == c.a || m_textJudgeNumbers[l][PLAYER_2].GetDiffuse().a == c.a) || !SOUND_ON_FULL_ALPHA) ) + if(SOUND_ON_FULL_ALPHA) { - m_soundJudgeSound[l].Play(); - m_TimeToPlayJudgeSound[l] = -1; + if( m_sprJudgeLabels[l].GetDiffuse().a != 1.0f && + m_textJudgeNumbers[l][PLAYER_1].GetDiffuse().a != 1.0f && + m_textJudgeNumbers[l][PLAYER_2].GetDiffuse().a != 1.0f ) + continue; } + m_soundJudgeSound[l].Play(); + m_TimeToPlayJudgeSound[l] = -1; } }