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

simplify, add some assertions

Browse Source
This commit is contained in:
Glenn Maynard
2003-04-19 22:24:01 +00:00
parent 88d378b69c
commit 147c2986e2
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+9 -1
View File
@@ -833,7 +833,15 @@ bool CompareNotesPointersForExtra(const Notes *n1, const Notes *n2)
void SongManager::GetExtraStageInfo( bool bExtra2, CString sPreferredGroup, const StyleDef *sd, void SongManager::GetExtraStageInfo( bool bExtra2, CString sPreferredGroup, const StyleDef *sd,
Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ) Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out )
{ {
if(GetExtraStageInfoFromCourse(bExtra2, (GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC ? GAMESTATE->m_pCurSong->m_sGroupName : GAMESTATE->m_sPreferredGroup), pSongOut, pNotesOut, po_out, so_out)) CString Group = GAMESTATE->m_sPreferredGroup;
if(Group == GROUP_ALL_MUSIC)
{
ASSERT(GAMESTATE->m_pCurSong);
Group = GAMESTATE->m_pCurSong->m_sGroupName;
}
ASSERT(Group != "");
if(GetExtraStageInfoFromCourse(bExtra2, Group, pSongOut, pNotesOut, po_out, so_out))
return; return;
// Choose a hard song for the extra stage // Choose a hard song for the extra stage