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

fix ScreenSelectOptionsMaster::ImportOptions doesn't set the correct selection for ROW_STEPS if PreferredDifficulty doesn't match current steps

Browse Source
This commit is contained in:
Chris Danford
2004-01-15 05:14:43 +00:00
parent 22fb3ec985
commit 35fbad5d17
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ModeChoice.cpp
+9 -2
View File
@@ -50,8 +50,12 @@ bool ModeChoice::DescribesCurrentMode( PlayerNumber pn ) const
return false;
if( m_style != STYLE_INVALID && GAMESTATE->m_CurStyle != m_style )
return false;
if( m_dc != DIFFICULTY_INVALID )
// HACK: don't compare m_dc if m_pSteps is set. This causes problems
// in ScreenSelectOptionsMaster::ImportOptions if m_PreferredDifficulty
// doesn't match the difficulty of m_pCurSteps.
if( m_pSteps == NULL && m_dc != DIFFICULTY_INVALID )
{
// Why is this checking for all players?
for( int pn=0; pn<NUM_PLAYERS; pn++ )
if( GAMESTATE->IsHumanPlayer(pn) && GAMESTATE->m_PreferredDifficulty[pn] != m_dc )
return false;
@@ -309,7 +313,10 @@ bool ModeChoice::IsZero() const
m_style != STYLE_INVALID ||
m_dc != DIFFICULTY_INVALID ||
m_sAnnouncer != "" ||
m_sModifiers != "" )
m_sModifiers != "" ||
m_pSteps != NULL ||
m_pCharacter != NULL ||
m_CourseDifficulty != COURSE_DIFFICULTY_INVALID )
return false;
return true;