diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index eb1754cdb7..794d08b33d 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -123,16 +123,11 @@ void split( const CString &Source, const CString &Deliminator, CStringArray& Add } -//----------------------------------------------------------------------------- -// Name: splitpath() -// Desc: -//----------------------------------------------------------------------------- -void splitpath( const bool UsingDirsOnly, const CString &Path, CString& Drive, CString& Dir, CString& FName, CString& Ext ) +void splitpath( bool UsingDirsOnly, const CString &Path, CString& Drive, CString& Dir, CString& FName, CString& Ext ) { - int nSecond; - // Look for a UNC Name! + // Look for a UNC filename. if (Path.Left(2) == "\\\\") { int nFirst = Path.Find("\\",3); @@ -146,7 +141,7 @@ void splitpath( const bool UsingDirsOnly, const CString &Path, CString& Drive, C else if (nSecond > nFirst) Drive = Path.Left(nSecond); } - else if (Path.Mid(1,1) == ":" ) // normal Drive Structure + else if (Path.Mid(1,1) == ":" ) // drive letter { nSecond = 2; Drive = Path.Left(2); diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h index f04d5e521e..7d1469e029 100644 --- a/stepmania/src/RageUtil.h +++ b/stepmania/src/RageUtil.h @@ -130,10 +130,12 @@ CString vssprintf( const char *fmt, va_list argList ); // Splits a Path into 4 parts (Directory, Drive, Filename, Extention). Supports UNC path names. // param1: Whether the Supplied Path (PARAM2) contains a directory name only -// or a file name (Reason: some directories will end with "xxx.xxx" +// or a file name (Reason: some directories will end with "aaa.bbb" // which is like a file name). +// We should just make sure all pathnames end with a slash, not special case it here. +// -glenn void splitpath( - const bool UsingDirsOnly, + bool UsingDirsOnly, const CString &Path, CString &Drive, CString &Dir,