Fix up MusicWheel. This code was a mess: huge blocks of copy-and-pasted
code, duplicated arrays in base classes that were never used ... (It's still ugly, but at least WheelBase is actually a real base class now.)
This commit is contained in:
@@ -143,10 +143,12 @@ void ScreenNetSelectMusic::Input( const InputEventPlus &input )
|
||||
GAMESTATE->m_PreferredSortOrder = so;
|
||||
GAMESTATE->m_SortOrder.Set( so );
|
||||
//Odd, changing the sort order requires us to call SetOpenGroup more than once
|
||||
m_MusicWheel.SetOpenGroup( ssprintf("%c", c ), so );
|
||||
m_MusicWheel.ChangeSort( so );
|
||||
m_MusicWheel.SetOpenGroup( ssprintf("%c", c ) );
|
||||
}
|
||||
m_MusicWheel.SelectSection( ssprintf("%c", c ) );
|
||||
m_MusicWheel.SetOpenGroup( ssprintf("%c", c ), so );
|
||||
m_MusicWheel.ChangeSort( so );
|
||||
m_MusicWheel.SetOpenGroup( ssprintf("%c", c ) );
|
||||
m_MusicWheel.Move(+1);
|
||||
}
|
||||
|
||||
@@ -241,7 +243,8 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM )
|
||||
//m_MusicWheel.ChangeSort( SORT_GROUP );
|
||||
//m_MusicWheel.FinishTweening();
|
||||
//SCREENMAN->PostMessageToTopScreen( SM_SetWheelSong, 0.710f );
|
||||
m_MusicWheel.SetOpenGroup( "", SORT_GROUP );
|
||||
m_MusicWheel.ChangeSort( SORT_GROUP );
|
||||
m_MusicWheel.SetOpenGroup( "" );
|
||||
}
|
||||
m_MusicWheel.SelectSong( m_cSong );
|
||||
m_MusicWheel.Select();
|
||||
|
||||
Reference in New Issue
Block a user