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

flip arg order

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-14 04:48:19 +00:00
parent b3b435ae5b
commit 36813781f0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+2 -2
View File
@@ -235,7 +235,7 @@ Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor )
ActorUtil::ResolvePath( sFile, GetSourcePath(pNode) ); ActorUtil::ResolvePath( sFile, GetSourcePath(pNode) );
pReturn = ActorUtil::MakeActor( sFile, pNode, pParentActor ); pReturn = ActorUtil::MakeActor( sFile, pParentActor, pNode );
if( pReturn == NULL ) if( pReturn == NULL )
goto all_done; goto all_done;
} }
@@ -355,7 +355,7 @@ namespace
* If pParent is non-NULL, it's the parent node when nesting XML, which is * If pParent is non-NULL, it's the parent node when nesting XML, which is
* used only by ActorUtil::LoadFromNode. * used only by ActorUtil::LoadFromNode.
*/ */
Actor* ActorUtil::MakeActor( const RString &sPath_, const XNode *pParent, Actor *pParentActor ) Actor* ActorUtil::MakeActor( const RString &sPath_, Actor *pParentActor, const XNode *pParent )
{ {
static const XNode dummy; static const XNode dummy;
if( pParent == NULL ) if( pParent == NULL )
stepmania/src/ActorUtil.h
+1 -1
View File
@@ -66,7 +66,7 @@ namespace ActorUtil
// Return a Sprite, BitmapText, or Model depending on the file type // Return a Sprite, BitmapText, or Model depending on the file type
Actor* LoadFromNode( const XNode* pNode, Actor *pParentActor = NULL ); Actor* LoadFromNode( const XNode* pNode, Actor *pParentActor = NULL );
Actor* MakeActor( const RString &sPath, const XNode *pParent = NULL, Actor *pParentActor = NULL ); Actor* MakeActor( const RString &sPath, Actor *pParentActor = NULL, const XNode *pParent = NULL );
RString GetSourcePath( const XNode *pNode ); RString GetSourcePath( const XNode *pNode );
RString GetWhere( const XNode *pNode ); RString GetWhere( const XNode *pNode );
bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut ); bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut );