GrayArrow => ReceptorArrow
move ReceptorArrow metrics into NoteSkin ReceptorArrow metrics, code cleanup
This commit is contained in:
@@ -37,9 +37,17 @@ static Actor* LoadActor( CString sPath )
|
||||
CString sFileName;
|
||||
ini.GetValue( "Actor", "File", sFileName );
|
||||
|
||||
CString sNewPath = Dirname( sPath ) + sFileName;
|
||||
CString sDir = Dirname( sPath );
|
||||
|
||||
sNewPath = DerefRedir( sNewPath );
|
||||
CStringArray asFiles;
|
||||
GetDirListing( sDir + sFileName + "*", asFiles );
|
||||
|
||||
if( asFiles.empty() )
|
||||
RageException::Throw( "The actor file '%s' references a file '%s' which doesn't exist.", sPath.c_str(), sFileName.c_str() );
|
||||
else if( asFiles.size() > 1 )
|
||||
RageException::Throw( "The actor file '%s' references a file '%s' which has multiple matches.", sPath.c_str(), sFileName.c_str() );
|
||||
|
||||
CString sNewPath = DerefRedir( sDir + asFiles[0] );
|
||||
|
||||
/* XXX: How to handle translations? Maybe we should have one metrics section,
|
||||
* "Text", eg:
|
||||
@@ -71,9 +79,6 @@ static Actor* LoadActor( CString sPath )
|
||||
}
|
||||
else
|
||||
{
|
||||
if( !DoesFileExist(sNewPath) )
|
||||
RageException::Throw( "The actor file '%s' references a file '%s' which doesn't exist.", sPath.c_str(), sNewPath.c_str() );
|
||||
|
||||
pActor = MakeActor( sNewPath );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user