From 82ed283ac0616f7b37997338fee247c59f500b21 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 16 Jan 2005 02:04:39 +0000 Subject: [PATCH] load scroller in LoadFromAniDir for now; not sure why this doesn't always work --- stepmania/src/BGAnimation.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp index 5783bf2e0e..ab0709b3bf 100644 --- a/stepmania/src/BGAnimation.cpp +++ b/stepmania/src/BGAnimation.cpp @@ -133,6 +133,10 @@ void BGAnimation::LoadFromAniDir( const CString &_sAniDir ) if( pBGAnimation == NULL ) pBGAnimation = &dummy; LoadFromNode( sAniDir, *pBGAnimation ); + + const XNode* pScrollerNode = ini.GetChild( "Scroller" ); + if( pScrollerNode != NULL ) + ActorScroller::LoadFromNode( ini.GetPath(), pScrollerNode ); } else { @@ -188,12 +192,6 @@ void BGAnimation::LoadFromNode( const CString &sDir, const XNode& node ) } } - { - const XNode* pScrollerNode = node.GetChild( "Scroller" ); - if( pScrollerNode != NULL ) - ActorScroller::LoadFromNode( sDir, pScrollerNode ); - } - Command cmd; cmd.Load( "PlayCommand,Init" ); this->RunCommandOnChildren( cmd );