From 10eaf80cf478365e0fd85b688962bb8bd7202dbb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 12 May 2003 01:02:11 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenEvaluation.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 886ff016bb..03277d8077 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -817,16 +817,17 @@ void ScreenEvaluation::Update( float fDeltaTime ) if(m_TimeToPlayJudgeSound[l] == -1) continue; + if(RageTimer::GetTimeSinceStart() < m_fScreenCreateTime + m_TimeToPlayJudgeSound[l]) + continue; + RageColor c; c.a = 1; - if((m_fScreenCreateTime + m_TimeToPlayJudgeSound[l]) < RageTimer::GetTimeSinceStart()) + 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_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) ) - { - m_soundJudgeSound[l].Play(); - m_TimeToPlayJudgeSound[l] = -1; - } + m_soundJudgeSound[l].Play(); + m_TimeToPlayJudgeSound[l] = -1; } + } }