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

Don't pick up KSF "intro.wav" files as song music.

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-04 20:07:25 +00:00
parent e4b1a2f6cc
commit 9021632dae
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+12 -5
View File
@@ -597,11 +597,18 @@ void Song::TidyUpData()
GetDirListing( m_sSongDir + CString("*.ogg"), arrayPossibleMusic ); GetDirListing( m_sSongDir + CString("*.ogg"), arrayPossibleMusic );
GetDirListing( m_sSongDir + CString("*.wav"), arrayPossibleMusic ); GetDirListing( m_sSongDir + CString("*.wav"), arrayPossibleMusic );
if( !arrayPossibleMusic.empty() ) // we found a match if( !arrayPossibleMusic.empty() )
m_sMusicFile = arrayPossibleMusic[0]; {
// Don't throw on missing music. -Chris int idx = 0;
// else /* If the first song is "intro", and we have more than one available,
// RageException::Throw( "The song in '%s' is missing a music file. You must place a music file in the song folder or remove the song", m_sSongDir.c_str() ); * don't use it--it's probably a KSF intro music file, which we don't support. */
if( arrayPossibleMusic.size() > 1 &&
!arrayPossibleMusic[0].Left(5).CompareNoCase("intro") )
++idx;
// we found a match
m_sMusicFile = arrayPossibleMusic[idx];
}
} }
/* This must be done before radar calculation. */ /* This must be done before radar calculation. */