From 1c2e75c9a0da92ea0409e105b7602173328a2c26 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 29 Oct 2003 21:06:33 +0000 Subject: [PATCH] simplify --- stepmania/src/Course.cpp | 4 +--- stepmania/src/NotesLoaderKSF.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 1dc1450772..d040904603 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -115,9 +115,7 @@ void Course::LoadFromCRSFile( CString sPath ) if( !msd.ReadFile(sPath) ) RageException::Throw( "Error opening CRS file '%s'.", sPath.c_str() ); - CString sDir, sFName, sExt; - splitrelpath( sPath, sDir, sFName, sExt ); - sFName = sDir + sFName; + const CString sFName = SetExtension( sPath, "" ); CStringArray arrayPossibleBanners; GetDirListing( sFName + ".png", arrayPossibleBanners, false, true ); diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp index f9bae1aec6..ddd64e5fea 100644 --- a/stepmania/src/NotesLoaderKSF.cpp +++ b/stepmania/src/NotesLoaderKSF.cpp @@ -101,7 +101,7 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Steps &out, const Song &s { CString sDir, sFName, sExt; - splitrelpath( sPath, sDir, sFName, sExt ); + splitpath( sPath, sDir, sFName, sExt ); sFName.MakeLower(); out.SetDescription(sFName);