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

use GetAttrPath

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-09 07:44:37 +00:00
parent 7477cd1e4f
commit ccf171dbc8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+3 -6
View File
@@ -233,9 +233,8 @@ Actor* ActorUtil::LoadFromNode( const RString& sDir, const XNode* pNode, Actor *
{ {
// automatically figure out the type // automatically figure out the type
RString sFile; RString sFile;
pNode->GetAttrValue( "File", sFile ); ActorUtil::GetAttrPath( pNode, "File", sFile );
bool bIsAbsolutePath = sFile.Left(1) == "/";
FixSlashesInPlace( sFile ); FixSlashesInPlace( sFile );
/* Be careful: if sFile is "", and we don't check it, then we can end up recursively /* Be careful: if sFile is "", and we don't check it, then we can end up recursively
@@ -249,11 +248,9 @@ Actor* ActorUtil::LoadFromNode( const RString& sDir, const XNode* pNode, Actor *
goto all_done; goto all_done;
} }
RString sNewPath = bIsAbsolutePath ? sFile : sDir+sFile; ActorUtil::ResolvePath( sFile, sDir );
ActorUtil::ResolvePath( sNewPath, sDir ); pReturn = ActorUtil::MakeActor( sFile, pNode, pParentActor );
pReturn = ActorUtil::MakeActor( sNewPath, pNode, pParentActor );
if( pReturn == NULL ) if( pReturn == NULL )
goto all_done; goto all_done;
} }