simplify

2005-10-11 00:48:27 +00:00
parent 92585fcaa9
commit d87cfccfb9
1 changed files with 9 additions and 11 deletions
@@ -247,22 +247,20 @@ Actor* ActorUtil::MakeActor( const CString &sPath )
 				sDir += '/';

 			CString sXml = sDir + "default.xml";
-			if( DoesFileExist(sXml) )
-			{
-				XNode xml;
-				if( !xml.LoadFromFile(sXml) )
-				{
-					// XNode will warn about the error
-					return new Actor;
-				}
-				return LoadFromActorFile( sDir, &xml );
-			}
-			else
+			if( !DoesFileExist(sXml) )
 			{
 				BGAnimation *pBGA = new BGAnimation;
 				pBGA->LoadFromAniDir( sDir );
 				return pBGA;
 			}
+
+			XNode xml;
+			if( !xml.LoadFromFile(sXml) )
+			{
+				// XNode will warn about the error
+				return new Actor;
+			}
+			return LoadFromActorFile( sDir, &xml );
 		}
 	case FT_Xml:
 		{