Don't mess with the sort order in ScreenSelectGroup.
This commit is contained in:
@@ -38,7 +38,6 @@ ScreenSelectGroup::ScreenSelectGroup() : Screen("ScreenSelectGroup")
|
|||||||
if( !PREFSMAN->m_bShowSelectGroup )
|
if( !PREFSMAN->m_bShowSelectGroup )
|
||||||
{
|
{
|
||||||
GAMESTATE->m_sPreferredGroup = GROUP_ALL_MUSIC;
|
GAMESTATE->m_sPreferredGroup = GROUP_ALL_MUSIC;
|
||||||
GAMESTATE->m_SongSortOrder = SORT_GROUP;
|
|
||||||
HandleScreenMessage( SM_GoToNextScreen );
|
HandleScreenMessage( SM_GoToNextScreen );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -256,9 +255,6 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn )
|
|||||||
GAMESTATE->m_pCurSong = NULL;
|
GAMESTATE->m_pCurSong = NULL;
|
||||||
GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() );
|
GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() );
|
||||||
|
|
||||||
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
|
|
||||||
GAMESTATE->m_SongSortOrder = SORT_GROUP;
|
|
||||||
|
|
||||||
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
|
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
|
||||||
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") );
|
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") );
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user