actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix BGAnimation doesn't load <children>

Browse Source 
fix BGAnimation in Background leaks children
This commit is contained in:
Chris Danford
2005-03-01 16:59:29 +00:00
parent bcce4df6f7
commit 63868cee5e
6 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorFrame.cpp
+21 -25
View File
@@ -19,31 +19,6 @@ LUA_REGISTER_CLASS( ActorFrame )
* that string instead create an ActorFrameAutoDeleteChildren object.
*/
//REGISTER_ACTOR_CLASS( ActorFrame )
class ActorFrameAutoDeleteChildren : public ActorFrame
{
public:
ActorFrameAutoDeleteChildren() { DeleteChildrenWhenDone(true); }
void LoadFromNode( const CString& sDir, const XNode* pNode )
{
ActorFrame::LoadFromNode( sDir, pNode );
//
// Load children
//
const XNode* pChildren = pNode->GetChild("children");
if( pChildren )
{
FOREACH_CONST_Child( pChildren, pChild )
{
Actor* pChildActor = ActorUtil::LoadFromActorFile( sDir, pChild );
if( pChildActor )
AddChild( pChildActor );
}
SortByDrawOrder();
}
}
};
REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameAutoDeleteChildren, ActorFrame )
@@ -72,6 +47,27 @@ void ActorFrame::LoadFromNode( const CString& sDir, const XNode* pNode )
m_bOverrideLighting = pNode->GetAttrValue( "Lighting", m_bLighting );
}
void ActorFrame::LoadChildrenFromNode( const CString& sDir, const XNode* pNode )
{
// Shoudn't be calling this unless we're going to delete our children.
ASSERT( m_bDeleteChildren );
//
// Load children
//
const XNode* pChildren = pNode->GetChild("children");
if( pChildren )
{
FOREACH_CONST_Child( pChildren, pChild )
{
Actor* pChildActor = ActorUtil::LoadFromActorFile( sDir, pChild );
if( pChildActor )
AddChild( pChildActor );
}
SortByDrawOrder();
}
}
void ActorFrame::AddChild( Actor* pActor )
{
#if _DEBUG