diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index 95b841cd57..8954d6eabe 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -47,7 +47,7 @@ Actor* ActorUtil::Create( const RString& sClassName, const XNode* pNode, Actor * return pRet; } -void ActorUtil::ResolvePath( RString &sPath, const RString &sName ) +bool ActorUtil::ResolvePath( RString &sPath, const RString &sName ) { retry: CollapsePath( sPath ); @@ -72,10 +72,7 @@ retry: FlushDirCache(); goto retry; case Dialog::ignore: - asPaths.push_back( sPath ); - if( GetExtension(asPaths[0]) == "" ) - asPaths[0] = SetExtension( asPaths[0], "png" ); - break; + return false; default: ASSERT(0); } @@ -107,6 +104,7 @@ retry: } sPath = DerefRedir( sPath ); + return true; } static void PushParamsTable( Lua *L ) diff --git a/stepmania/src/ActorUtil.h b/stepmania/src/ActorUtil.h index 84a0800acc..2a22f9e4be 100644 --- a/stepmania/src/ActorUtil.h +++ b/stepmania/src/ActorUtil.h @@ -71,7 +71,7 @@ namespace ActorUtil RString GetWhere( const XNode *pNode ); bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut ); - void ResolvePath( RString &sPath, const RString &sName ); + bool ResolvePath( RString &sPath, const RString &sName ); void SortByZPosition( vector &vActors );