From 36813781f0ebceab4a4a86ec9e17709b43f6dd8f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 14 Oct 2006 04:48:19 +0000 Subject: [PATCH] flip arg order --- stepmania/src/ActorUtil.cpp | 4 ++-- stepmania/src/ActorUtil.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index 4fcb9feca4..ff71335db2 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -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 ) diff --git a/stepmania/src/ActorUtil.h b/stepmania/src/ActorUtil.h index a3e63b6b94..84a0800acc 100644 --- a/stepmania/src/ActorUtil.h +++ b/stepmania/src/ActorUtil.h @@ -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 );