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

allow omitting group in courses

Browse Source
This commit is contained in:
Glenn Maynard
2003-02-17 05:16:56 +00:00
parent 3b0a29f3db
commit 93a1dbf9c7
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+13 -10
View File
@@ -77,22 +77,25 @@ Song *Course::FindSong(CString sGroup, CString sSong) const
{ {
Song* pSong = apSongs[i]; Song* pSong = apSongs[i];
if( sGroup.CompareNoCase(pSong->m_sGroupName) == 0) if( sGroup.size() && sGroup.CompareNoCase(pSong->m_sGroupName) != 0)
{ continue; /* wrong group */
CString sDir = pSong->GetSongDir(); CString sDir = pSong->GetSongDir();
sDir.Replace("\\","/"); sDir.Replace("\\","/");
CStringArray bits; CStringArray bits;
split( sDir, "/", bits ); split( sDir, "/", bits );
ASSERT(bits.size() >= 2); /* should always have at least two parts */
CString sLastBit = bits[bits.size()-1]; CString sLastBit = bits[bits.size()-1];
CString sFullTitle = pSong->GetFullTranslitTitle();
if( sSong.CompareNoCase(sLastBit)==0 || sSong.CompareNoCase(sFullTitle)==0 ) // match on song dir or title (ala DWI) // match on song dir or title (ala DWI)
if( sSong.CompareNoCase(sLastBit)==0 )
return pSong;
if( sSong.CompareNoCase(pSong->GetFullTranslitTitle())==0 )
return pSong; return pSong;
} }
}
LOG->Trace( "Course file '%s' contains a song '%s/%s' that is not present", LOG->Trace( "Course file '%s' contains a song '%s%s%s' that is not present",
m_sPath.GetString(), sGroup.GetString(), sSong.GetString()); m_sPath.GetString(), sGroup.GetString(), sGroup.size()? "/":"", sSong.GetString());
return NULL; return NULL;
} }
@@ -189,10 +192,10 @@ void Course::LoadFromCRSFile( CString sPath )
sSong.Replace( "\\", "/" ); sSong.Replace( "\\", "/" );
CStringArray bits; CStringArray bits;
split( sSong, "/", bits ); split( sSong, "/", bits );
if( bits.size() == 2 ) if( bits.size() == 1 )
{ new_entry.pSong = FindSong( "", bits[0] );
else if( bits.size() == 2 )
new_entry.pSong = FindSong( bits[0], bits[1] ); new_entry.pSong = FindSong( bits[0], bits[1] );
}
else else
{ {
LOG->Warn( "Course file '%s' contains a fixed song entry '%s' that is invalid. " LOG->Warn( "Course file '%s' contains a fixed song entry '%s' that is invalid. "