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

ActorUtil::LoadFromActorFile -> ActorUtil::LoadFromNode

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-11 02:51:05 +00:00
parent 201fe355ac
commit c9cb09dd36
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
{
if( pChild->m_sName == "Input" )
{
/* Parameters are set as globals by ActorUtil::LoadFromActorFile.
/* Parameters are set as globals by ActorUtil::LoadFromNode.
* If parameters are specified here, save them to the actor. Accessing
* parameters as globals directly is deprecated. */
CString sName;
stepmania/src/ActorFrame.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ void ActorFrame::LoadChildrenFromNode( const CString& sDir, const XNode* pNode )
{
FOREACH_CONST_Child( pChildren, pChild )
{
Actor* pChildActor = ActorUtil::LoadFromActorFile( sDir, pChild );
Actor* pChildActor = ActorUtil::LoadFromNode( sDir, pChild );
if( pChildActor )
AddChild( pChildActor );
}
stepmania/src/ActorUtil.cpp
+2 -2
View File
@@ -105,7 +105,7 @@ retry:
}
Actor* ActorUtil::LoadFromActorFile( const CString& sDir, const XNode* pNode )
Actor* ActorUtil::LoadFromNode( const CString& sDir, const XNode* pNode )
{
ASSERT( pNode );
@@ -266,7 +266,7 @@ Actor* ActorUtil::MakeActor( const CString &sPath_ )
return new Actor;
}
CString sDir = Dirname( sPath );
return LoadFromActorFile( sDir, &xml );
return ActorUtil::LoadFromNode( sDir, &xml );
}
case FT_Bitmap:
case FT_Movie:
stepmania/src/ActorUtil.h
+1 -1
View File
@@ -66,7 +66,7 @@ namespace ActorUtil
inline void SetXYAndOnCommand( Actor* pActor, const CString &sType, Actor* pParent = NULL ) { if(pActor) SetXYAndOnCommand( *pActor, sType, pParent ); }
// Return a Sprite, BitmapText, or Model depending on the file type
Actor* LoadFromActorFile( const CString& sAniDir, const XNode* pNode );
Actor* LoadFromNode( const CString& sAniDir, const XNode* pNode );
Actor* MakeActor( const CString &sPath );
void ResolvePath( CString &sPath, const CString &sName );
stepmania/src/AutoActor.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ void AutoActor::LoadFromNode( const CString &sDir, const XNode* pNode )
{
Unload();
m_pActor = ActorUtil::LoadFromActorFile( sDir, pNode );
m_pActor = ActorUtil::LoadFromNode( sDir, pNode );
}
void AutoActor::LoadAndSetName( const CString &sScreenName, const CString &sActorName )
stepmania/src/BGAnimationLayer.cpp
+1 -1
View File
@@ -462,7 +462,7 @@ void BGAnimationLayer::LoadFromNode( const CString& sDir, const XNode* pNode )
{
case TYPE_SPRITE:
{
Actor* pActor = ActorUtil::LoadFromActorFile( sAniDir, pNode );
Actor* pActor = ActorUtil::LoadFromNode( sAniDir, pNode );
this->AddChild( pActor );
if( bStretch )
pActor->StretchTo( FullScreenRectF );