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

Don't add empty group names.

Browse Source
This commit is contained in:
Glenn Maynard
2002-09-09 02:23:47 +00:00
parent ca59284ac7
commit c5a1844fc2
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+17 -12
View File
@@ -107,23 +107,14 @@ void SongManager::LoadStepManiaSongDir( CString sDir, void(*callback)() )
LOG->Trace( ssprintf("Group banner for '%s' is '%s'.", sGroupDirName, sBannerPath) ); LOG->Trace( ssprintf("Group banner for '%s' is '%s'.", sGroupDirName, sBannerPath) );
} }
/* Add this group to the group array. */
int j;
for(j = 0; j < m_arrayGroupNames.GetSize(); ++j)
if( sGroupDirName == m_arrayGroupNames[j] ) break;
if( j == m_arrayGroupNames.GetSize() )
{
m_arrayGroupNames.Add( sGroupDirName );
m_GroupBannerPaths.Add(sBannerPath);
}
// Find all Song folders in this group directory // Find all Song folders in this group directory
CStringArray arraySongDirs; CStringArray arraySongDirs;
GetDirListing( ssprintf("%s\\%s\\*.*", sDir, sGroupDirName), arraySongDirs, true ); GetDirListing( ssprintf("%s\\%s\\*.*", sDir, sGroupDirName), arraySongDirs, true );
SortCStringArray( arraySongDirs ); SortCStringArray( arraySongDirs );
int j;
int loaded = 0;
for( j=0; j< arraySongDirs.GetSize(); j++ ) // for each song dir for( j=0; j< arraySongDirs.GetSize(); j++ ) // for each song dir
{ {
CString sSongDirName = arraySongDirs[j]; CString sSongDirName = arraySongDirs[j];
@@ -138,6 +129,20 @@ void SongManager::LoadStepManiaSongDir( CString sDir, void(*callback)() )
Song* pNewSong = new Song; Song* pNewSong = new Song;
pNewSong->LoadFromSongDir( ssprintf("%s\\%s\\%s", sDir, sGroupDirName, sSongDirName) ); pNewSong->LoadFromSongDir( ssprintf("%s\\%s\\%s", sDir, sGroupDirName, sSongDirName) );
m_pSongs.Add( pNewSong ); m_pSongs.Add( pNewSong );
loaded++;
}
/* Don't add the group name if we didn't load any songs in this group. */
if(!loaded) continue;
/* Add this group to the group array. */
for(j = 0; j < m_arrayGroupNames.GetSize(); ++j)
if( sGroupDirName == m_arrayGroupNames[j] ) break;
if( j == m_arrayGroupNames.GetSize() )
{
m_arrayGroupNames.Add( sGroupDirName );
m_GroupBannerPaths.Add(sBannerPath);
} }
} }