From 0b3db98d005fa4f5d9a8b612956a2ca3abfadb68 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 3 May 2007 22:59:14 +0000 Subject: [PATCH] add timerglobal --- stepmania/src/Actor.cpp | 9 +++++++++ stepmania/src/Actor.h | 1 + 2 files changed, 10 insertions(+) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 23b679c73b..9a44963801 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -626,6 +626,14 @@ void Actor::UpdateInternal( float fDeltaTime ) m_fSecsIntoEffect -= GetEffectPeriod(); break; + case CLOCK_TIMER_GLOBAL: + { + float fTime = RageTimer::GetTimeSinceStartFast(); + m_fEffectDelta = fTime - m_fSecsIntoEffect; + m_fSecsIntoEffect = fTime; + break; + } + case CLOCK_BGM_BEAT: m_fEffectDelta = g_fCurrentBGMBeat - m_fSecsIntoEffect; m_fSecsIntoEffect = g_fCurrentBGMBeat; @@ -760,6 +768,7 @@ void Actor::ScaleTo( const RectF &rect, StretchType st ) void Actor::SetEffectClockString( const RString &s ) { if (s.EqualsNoCase("timer")) this->SetEffectClock( CLOCK_TIMER ); + if (s.EqualsNoCase("timerglobal")) this->SetEffectClock( CLOCK_TIMER_GLOBAL ); else if(s.EqualsNoCase("beat")) this->SetEffectClock( CLOCK_BGM_BEAT ); else if(s.EqualsNoCase("music")) this->SetEffectClock( CLOCK_BGM_TIME ); else if(s.EqualsNoCase("bgm")) this->SetEffectClock( CLOCK_BGM_BEAT ); // compat, deprecated diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index 89c1160c1b..67d67c5b5d 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -94,6 +94,7 @@ public: enum EffectClock { CLOCK_TIMER, + CLOCK_TIMER_GLOBAL, CLOCK_BGM_TIME, CLOCK_BGM_BEAT, CLOCK_LIGHT_1 = 1000,