From 45c114590ed17bdef0662e33115e135cf07b02df Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 1 Aug 2006 20:36:19 +0000 Subject: [PATCH] don't ignore specified effect period if the effect is already running --- stepmania/src/Actor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 3e5fc1450c..95864549bd 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -899,9 +899,9 @@ void Actor::SetEffectDiffuseBlink( float fEffectPeriodSeconds, RageColor c1, Rag if( m_Effect != diffuse_blink ) { m_Effect = diffuse_blink; - SetEffectPeriod( fEffectPeriodSeconds ); m_fSecsIntoEffect = 0; } + SetEffectPeriod( fEffectPeriodSeconds ); m_effectColor1 = c1; m_effectColor2 = c2; } @@ -911,9 +911,9 @@ void Actor::SetEffectDiffuseShift( float fEffectPeriodSeconds, RageColor c1, Rag if( m_Effect != diffuse_shift ) { m_Effect = diffuse_shift; - SetEffectPeriod( fEffectPeriodSeconds ); m_fSecsIntoEffect = 0; } + SetEffectPeriod( fEffectPeriodSeconds ); m_effectColor1 = c1; m_effectColor2 = c2; } @@ -923,9 +923,9 @@ void Actor::SetEffectDiffuseRamp( float fEffectPeriodSeconds, RageColor c1, Rage if( m_Effect != diffuse_ramp ) { m_Effect = diffuse_ramp; - SetEffectPeriod( fEffectPeriodSeconds ); m_fSecsIntoEffect = 0; } + SetEffectPeriod( fEffectPeriodSeconds ); m_effectColor1 = c1; m_effectColor2 = c2; } @@ -935,9 +935,9 @@ void Actor::SetEffectGlowBlink( float fEffectPeriodSeconds, RageColor c1, RageCo if( m_Effect != glow_blink ) { m_Effect = glow_blink; - SetEffectPeriod( fEffectPeriodSeconds ); m_fSecsIntoEffect = 0; } + SetEffectPeriod( fEffectPeriodSeconds ); m_effectColor1 = c1; m_effectColor2 = c2; } @@ -947,9 +947,9 @@ void Actor::SetEffectGlowShift( float fEffectPeriodSeconds, RageColor c1, RageCo if( m_Effect != glow_shift ) { m_Effect = glow_shift; - SetEffectPeriod( fEffectPeriodSeconds ); m_fSecsIntoEffect = 0; } + SetEffectPeriod( fEffectPeriodSeconds ); m_effectColor1 = c1; m_effectColor2 = c2; }