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

rearrange

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-11 00:47:15 +00:00
parent 2d4cd30865
commit 92585fcaa9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+11 -11
View File
@@ -240,17 +240,6 @@ Actor* ActorUtil::MakeActor( const CString &sPath )
FileType ft = GetFileType( sPath ); FileType ft = GetFileType( sPath );
switch( ft ) switch( ft )
{ {
case FT_Xml:
{
XNode xml;
if( !xml.LoadFromFile(sPath) )
{
// XNode will warn about the error
return new Actor;
}
CString sDir = Dirname( sPath );
return LoadFromActorFile( sDir, &xml );
}
case FT_Directory: case FT_Directory:
{ {
CString sDir = sPath; CString sDir = sPath;
@@ -275,6 +264,17 @@ Actor* ActorUtil::MakeActor( const CString &sPath )
return pBGA; return pBGA;
} }
} }
case FT_Xml:
{
XNode xml;
if( !xml.LoadFromFile(sPath) )
{
// XNode will warn about the error
return new Actor;
}
CString sDir = Dirname( sPath );
return LoadFromActorFile( sDir, &xml );
}
case FT_Bitmap: case FT_Bitmap:
case FT_Movie: case FT_Movie:
{ {