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

don't derive sGroup twice

Browse Source
This commit is contained in:
Glenn Maynard
2003-07-30 05:34:47 +00:00
parent bafb9e0f2b
commit 33b8fc3a3a
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+5 -6
View File
@@ -919,15 +919,15 @@ bool CompareNotesPointersForExtra(const Notes *n1, const Notes *n2)
void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd, void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd,
Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ) Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out )
{ {
CString Group = GAMESTATE->m_sPreferredGroup; CString sGroup = GAMESTATE->m_sPreferredGroup;
if(Group == GROUP_ALL_MUSIC) if(sGroup == GROUP_ALL_MUSIC)
{ {
ASSERT(GAMESTATE->m_pCurSong); ASSERT(GAMESTATE->m_pCurSong);
Group = GAMESTATE->m_pCurSong->m_sGroupName; sGroup = GAMESTATE->m_pCurSong->m_sGroupName;
} }
ASSERT(Group != ""); ASSERT(sGroup != "");
if(GetExtraStageInfoFromCourse(bExtra2, Group, pSongOut, pNotesOut, po_out, so_out)) if(GetExtraStageInfoFromCourse(bExtra2, sGroup, pSongOut, pNotesOut, po_out, so_out))
return; return;
// Choose a hard song for the extra stage // Choose a hard song for the extra stage
@@ -937,7 +937,6 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd,
Notes* pExtra2Notes = NULL; Notes* pExtra2Notes = NULL;
vector<Song*> apSongs; vector<Song*> apSongs;
CString sGroup = GAMESTATE->m_sPreferredGroup==GROUP_ALL_MUSIC ? GAMESTATE->m_pCurSong->m_sGroupName : GAMESTATE->m_sPreferredGroup;
SONGMAN->GetSongs( apSongs, sGroup ); SONGMAN->GetSongs( apSongs, sGroup );
for( unsigned s=0; s<apSongs.size(); s++ ) // foreach song for( unsigned s=0; s<apSongs.size(); s++ ) // foreach song
{ {