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

fix default.xml loading

Browse Source 
add Condition check in LoadFromActorFile
This commit is contained in:
Chris Danford
2005-01-17 04:08:08 +00:00
parent f26a33713d
commit a5d40aad79
4 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorFrame.cpp
+10 -3
View File
@@ -30,7 +30,8 @@ void ActorFrame::LoadFromNode( const CString &sDir, const XNode* pNode )
FOREACH_CONST_Child( pChildren, pChild )
{
Actor* pChildActor = LoadFromActorFile( sDir, *pChild );
AddChild( pChildActor );
if( pChildActor )
AddChild( pChildActor );
}
}
}
@@ -158,7 +159,10 @@ float ActorFrame::GetTweenTimeLeft() const
float m = Actor::GetTweenTimeLeft();
for( unsigned i=0; i<m_SubActors.size(); i++ )
m = max(m, m_fHibernateSecondsLeft + m_SubActors[i]->GetTweenTimeLeft());
{
const Actor* pActor = m_SubActors[i];
m = max(m, m_fHibernateSecondsLeft + pActor->GetTweenTimeLeft());
}
return m;
@@ -230,7 +234,10 @@ void ActorFrame::PlayCommand( const CString &sCommandName )
Actor::PlayCommand( sCommandName );
for( unsigned i=0; i<m_SubActors.size(); i++ )
m_SubActors[i]->PlayCommand( sCommandName );
{
Actor* pActor = m_SubActors[i];
pActor->PlayCommand( sCommandName );
}
}
/*