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

fix PREFSMAN->m_sDefaultModifiers for difficulty

Browse Source
This commit is contained in:
Glenn Maynard
2003-06-25 04:43:33 +00:00
parent 8e7fd05c2d
commit 595e4ccb0a
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+18 -7
View File
@@ -507,6 +507,18 @@ void ScreenSelectMusic::HarderDifficulty( PlayerNumber pn )
AfterNotesChange( pn ); AfterNotesChange( pn );
} }
template<class T>
void setmin( T &a, const T &b )
{
a = min(a, b);
}
template<class T>
void setmax( T &a, const T &b )
{
a = max(a, b);
}
/* Adjust game options. These settings may be overridden again later by the /* Adjust game options. These settings may be overridden again later by the
* SongOptions menu. */ * SongOptions menu. */
void ScreenSelectMusic::AdjustOptions() void ScreenSelectMusic::AdjustOptions()
@@ -521,24 +533,23 @@ void ScreenSelectMusic::AdjustOptions()
dc = min(dc, GAMESTATE->m_pCurNotes[p]->GetDifficulty()); dc = min(dc, GAMESTATE->m_pCurNotes[p]->GetDifficulty());
} }
LOG->Trace( "AdjustOptions: difficulty %i", dc );
if( !GAMESTATE->m_bChangedFailMode ) if( !GAMESTATE->m_bChangedFailMode )
{ {
GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_ARCADE; /* Reset the fail type to the default. */
SongOptions so;
so.FromString( PREFSMAN->m_sDefaultModifiers );
GAMESTATE->m_SongOptions.m_FailType = so.m_FailType;
/* Easy and beginner are never harder than FAIL_END_OF_SONG. */ /* Easy and beginner are never harder than FAIL_END_OF_SONG. */
if(dc <= DIFFICULTY_EASY) if(dc <= DIFFICULTY_EASY)
{ setmax(GAMESTATE->m_SongOptions.m_FailType, SongOptions::FAIL_END_OF_SONG);
LOG->Trace( "AdjustOptions: EOS" );
GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_END_OF_SONG;
}
/* If beginner's steps were chosen, and this is the first stage, /* If beginner's steps were chosen, and this is the first stage,
* turn off failure completely--always give a second try. */ * turn off failure completely--always give a second try. */
if(dc == DIFFICULTY_BEGINNER && if(dc == DIFFICULTY_BEGINNER &&
!PREFSMAN->m_bEventMode && /* stage index is meaningless in event mode */ !PREFSMAN->m_bEventMode && /* stage index is meaningless in event mode */
GAMESTATE->m_iCurrentStageIndex == 0) GAMESTATE->m_iCurrentStageIndex == 0)
GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_OFF; setmax(GAMESTATE->m_SongOptions.m_FailType, SongOptions::FAIL_OFF);
} }
} }