From 3fa50f03e0a538be1d4e937b9dfda035a94a2184 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 5 Nov 2003 06:41:57 +0000 Subject: [PATCH] various overload fixes for using BGAnimation as a generic actor --- stepmania/src/BGAnimation.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp index 1ef2be0a50..493df85284 100644 --- a/stepmania/src/BGAnimation.cpp +++ b/stepmania/src/BGAnimation.cpp @@ -183,6 +183,7 @@ void BGAnimation::Update( float fDeltaTime ) { for( unsigned i=0; iUpdate( fDeltaTime ); + ActorFrame::Update( fDeltaTime ); } void BGAnimation::DrawPrimitives() @@ -209,22 +210,24 @@ void BGAnimation::SetDiffuse( const RageColor &c ) { for( unsigned i=0; iSetDiffuse(c); + ActorFrame::SetDiffuse( c ); } float BGAnimation::GetTweenTimeLeft() const { - float tot = 0; + float ret = 0; for( unsigned i=0; iGetMaxTweenTimeLeft(); + ret = max( ret, m_Layers[i]->GetMaxTweenTimeLeft() ); - return tot; + return max( ret, Actor::GetTweenTimeLeft() ); } void BGAnimation::FinishTweening() { for( unsigned i=0; iFinishTweening(); + ActorFrame::FinishTweening(); } void BGAnimation::PlayCommand( const CString &cmd )