ModeMenuAvailable metric removed; change Codes instead.

Merge the sort menu into the mode menu.
GAMESTATE->m_SortOrder is now GAMESTATE->m_PreferredSortOrder.
Allow the mode menu to have non-mutually-exclusive items.
This commit is contained in:
Glenn Maynard
2005-01-29 20:46:08 +00:00
parent 46f414e7e5
commit 8d48438c15
16 changed files with 116 additions and 141 deletions
+2 -2
View File
@@ -114,7 +114,7 @@ bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const
return false;
if( m_pTrail && GAMESTATE->m_pCurTrail[pn] != m_pTrail )
return false;
if( m_SortOrder != SORT_INVALID && GAMESTATE->m_SortOrder != m_SortOrder )
if( m_SortOrder != SORT_INVALID && GAMESTATE->m_PreferredSortOrder != m_SortOrder )
return false;
return true;
@@ -593,7 +593,7 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
if( !m_sSongGroup.empty() )
GAMESTATE->m_sPreferredSongGroup = m_sSongGroup;
if( m_SortOrder != SORT_INVALID )
GAMESTATE->m_SortOrder = m_SortOrder;
GAMESTATE->m_PreferredSortOrder = m_SortOrder;
if( m_iUnlockIndex != -1 )
UNLOCKMAN->UnlockCode( m_iUnlockIndex );
if( m_sSoundPath != "" )