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

use GetSongDir

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-13 23:41:11 +00:00
parent c86c5af9f8
commit 2b19012e40
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderKSF.cpp
+5 -5
View File
@@ -166,11 +166,11 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
for( i=0; i<arrayKSFFileNames.size(); i++ )
{
Notes* pNewNotes = new Notes;
LoadFromKSFFile( out.m_sSongDir + arrayKSFFileNames[i], *pNewNotes );
LoadFromKSFFile( out.GetSongDir() + arrayKSFFileNames[i], *pNewNotes );
out.m_apNotes.push_back( pNewNotes );
}
CString sPath = out.m_sSongDir + arrayKSFFileNames[0];
CString sPath = out.GetSongDir() + arrayKSFFileNames[0];
MsdFile msd;
bool bResult = msd.ReadFile( sPath );
@@ -251,9 +251,9 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
// search for music with song in the file name
CStringArray arrayPossibleMusic;
GetDirListing( out.m_sSongDir + CString("song.mp3"), arrayPossibleMusic );
GetDirListing( out.m_sSongDir + CString("song.ogg"), arrayPossibleMusic );
GetDirListing( out.m_sSongDir + CString("song.wav"), arrayPossibleMusic );
GetDirListing( out.GetSongDir() + CString("song.mp3"), arrayPossibleMusic );
GetDirListing( out.GetSongDir() + CString("song.ogg"), arrayPossibleMusic );
GetDirListing( out.GetSongDir() + CString("song.wav"), arrayPossibleMusic );
if( !arrayPossibleMusic.empty() ) // we found a match
out.m_sMusicFile = arrayPossibleMusic[0];