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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-09 05:18:17 +00:00
parent 612e2fa1df
commit 206f731d79
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+10 -7
View File
@@ -334,23 +334,26 @@ Actor* ActorUtil::MakeActor( const RString &sPath_, const XNode *pParent, Actor
if( ft == FT_Directory && sPath.Right(1) != "/" ) if( ft == FT_Directory && sPath.Right(1) != "/" )
sPath += '/'; sPath += '/';
if( ft == FT_Directory )
{
RString sXMLPath = sPath + "default.xml";
if( DoesFileExist(sXMLPath) )
{
sPath = sXMLPath;
ft = FT_Xml;
}
}
RString sDir = Dirname( sPath ); RString sDir = Dirname( sPath );
switch( ft ) switch( ft )
{ {
case FT_Directory: case FT_Directory:
{ {
sDir = sPath; sDir = sPath;
sPath = sDir + "default.xml";
if( !DoesFileExist(sPath) )
{
BGAnimation *pBGA = new BGAnimation; BGAnimation *pBGA = new BGAnimation;
pBGA->LoadFromAniDir( sDir ); pBGA->LoadFromAniDir( sDir );
return pBGA; return pBGA;
} }
/* fall through */
}
case FT_Xml: case FT_Xml:
{ {
XNode xml; XNode xml;