flip arg order
This commit is contained in:
@@ -235,7 +235,7 @@ Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor )
|
||||
|
||||
ActorUtil::ResolvePath( sFile, GetSourcePath(pNode) );
|
||||
|
||||
pReturn = ActorUtil::MakeActor( sFile, pNode, pParentActor );
|
||||
pReturn = ActorUtil::MakeActor( sFile, pParentActor, pNode );
|
||||
if( pReturn == NULL )
|
||||
goto all_done;
|
||||
}
|
||||
@@ -355,7 +355,7 @@ namespace
|
||||
* If pParent is non-NULL, it's the parent node when nesting XML, which is
|
||||
* 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;
|
||||
if( pParent == NULL )
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace ActorUtil
|
||||
|
||||
// Return a Sprite, BitmapText, or Model depending on the file type
|
||||
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 GetWhere( const XNode *pNode );
|
||||
bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut );
|
||||
|
||||
Reference in New Issue
Block a user