From 3a185cc977377e1aa62834fae10de106b7a447d6 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Sep 2005 23:43:06 +0000 Subject: [PATCH] yuck. ActorScroller doesn't need UseScroller, but BGAnimation does. Move the hack into BGAnimation, which is on its way out anyway. --- stepmania/src/BGAnimation.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp index 66ca304792..b960a2f069 100644 --- a/stepmania/src/BGAnimation.cpp +++ b/stepmania/src/BGAnimation.cpp @@ -149,8 +149,12 @@ void BGAnimation::LoadFromAniDir( const CString &_sAniDir ) void BGAnimation::LoadFromNode( const CString& sDir, const XNode* pNode ) { - ActorScrollerAutoDeleteChildren::LoadFromNode( sDir, pNode ); - + bool bUseScroller = false; + pNode->GetAttrValue( "UseScroller", bUseScroller ); + if( bUseScroller ) + ActorScrollerAutoDeleteChildren::LoadFromNode( sDir, pNode ); + else + ActorFrame::LoadFromNode( sDir, pNode ); /* Backwards-compatibility: if a "LengthSeconds" value is present, create a dummy * actor that sleeps for the given length of time. This will extend GetTweenTimeLeft. */