From 508495cf4a386667cf771b439e800ab0051ea4de Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 26 Aug 2005 19:41:19 +0000 Subject: [PATCH] no longer needed --- stepmania/src/ActorUtil.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index 45736f780c..57021a7f87 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -468,10 +468,6 @@ FileType ActorUtil::GetFileType( const CString &sPath ) if( sExt=="xml" ) return FT_Xml; else if( sExt=="actor" ) return FT_Actor; - /* Do this last, to avoid the IsADirectory in most cases. */ - /* Yuck. Some directories end in ".mpg", so do the directory - * check before the extensions check. */ - else if( IsADirectory(sPath) ) return FT_Directory; else if( sExt=="png" || sExt=="jpg" || @@ -483,8 +479,9 @@ FileType ActorUtil::GetFileType( const CString &sPath ) sExt=="mpg" ) return FT_Movie; else if( sExt=="txt" ) return FT_Model; + /* Do this last, to avoid the IsADirectory in most cases. */ + else if( IsADirectory(sPath) ) return FT_Directory; else return FT_Invalid; - } /*