extra stage fixes
This commit is contained in:
@@ -146,6 +146,7 @@ MusicWheel::MusicWheel()
|
|||||||
{
|
{
|
||||||
GAMESTATE->m_pCurNotes[p] = pNotes;
|
GAMESTATE->m_pCurNotes[p] = pNotes;
|
||||||
GAMESTATE->m_PlayerOptions[p] = po;
|
GAMESTATE->m_PlayerOptions[p] = po;
|
||||||
|
GAMESTATE->m_PreferredDifficulty[p] = pNotes->GetDifficulty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
GAMESTATE->m_SongOptions = so;
|
GAMESTATE->m_SongOptions = so;
|
||||||
|
|||||||
@@ -776,14 +776,6 @@ void ScreenSelectMusic::SwitchToPreferredDifficulty()
|
|||||||
if( !GAMESTATE->IsHumanPlayer( PlayerNumber(p) ) )
|
if( !GAMESTATE->IsHumanPlayer( PlayerNumber(p) ) )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
|
|
||||||
{
|
|
||||||
/* Extra stage; just keep the difficulty selected by
|
|
||||||
* SongManager::GetExtraStageInfo. */
|
|
||||||
m_iSelection[p] = GAMESTATE->m_pCurNotes[p]->GetDifficulty();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Find the closest match to the user's preferred difficulty. */
|
/* Find the closest match to the user's preferred difficulty. */
|
||||||
int CurDifference = -1;
|
int CurDifference = -1;
|
||||||
for( unsigned i=0; i<m_arrayNotes[p].size(); i++ )
|
for( unsigned i=0; i<m_arrayNotes[p].size(); i++ )
|
||||||
|
|||||||
Reference in New Issue
Block a user