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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-06 01:04:04 +00:00
parent e0bd0a1153
commit 44bb7da19f
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+20 -16
View File
@@ -146,25 +146,29 @@ Actor* LoadFromActorFile( CString sIniPath, CString sLayer )
pActor = pSprite;
TEXTUREMAN->EnableOddDimensionWarning();
}
else if( IsAFile(sDir+sFile) || IsADirectory(sDir+sFile) )
else
{
// If we know this is an exact match, don't bother with the
// GetDirListing below. The GetDirListing is causing problems with
// partial matching BGAnimation directory names.
CString sNewPath = DerefRedir( sDir+sFile );
pActor = MakeActor( sNewPath );
}
else
{
CStringArray asPaths;
GetDirListing( sDir + sFile + "*", asPaths, false, true ); // return path too
/* XXX: We need to do a theme search, since the file we're loading might
* be overridden by the theme. */
CString sNewPath = sDir+sFile;
if( asPaths.empty() )
RageException::Throw( "The actor file '%s' references a file '%s' which doesn't exist.", sIniPath.c_str(), sFile.c_str() );
else if( asPaths.size() > 1 )
RageException::Throw( "The actor file '%s' references a file '%s' which has multiple matches.", sIniPath.c_str(), sFile.c_str() );
// If we know this is an exact match, don't bother with the GetDirListing;
// it's causing problems with partial matching BGAnimation directory names.
if( !IsAFile(sNewPath) && !IsADirectory(sNewPath) )
{
CStringArray asPaths;
GetDirListing( sNewPath + "*", asPaths, false, true ); // return path too
if( asPaths.empty() )
RageException::Throw( "The actor file '%s' references a file '%s' which doesn't exist.", sIniPath.c_str(), sFile.c_str() );
else if( asPaths.size() > 1 )
RageException::Throw( "The actor file '%s' references a file '%s' which has multiple matches.", sIniPath.c_str(), sFile.c_str() );
sNewPath = asPaths[0];
}
sNewPath = DerefRedir( sNewPath );
CString sNewPath = DerefRedir( asPaths[0] );
pActor = MakeActor( sNewPath );
}
}