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

fix PO_STEP

Browse Source
This commit is contained in:
Glenn Maynard
2003-06-18 00:07:56 +00:00
parent bcd4121686
commit 2d64af7a93
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenPlayerOptions.cpp
+26 -8
View File
@@ -198,6 +198,25 @@ void ScreenPlayerOptions::ImportOptions()
m_iSelectedOption[p][PO_HOLD_NOTES] = po.m_bHoldNotes ? 1 : 0; m_iSelectedOption[p][PO_HOLD_NOTES] = po.m_bHoldNotes ? 1 : 0;
m_iSelectedOption[p][PO_DARK] = po.m_fDark ? 1 : 0; m_iSelectedOption[p][PO_DARK] = po.m_fDark ? 1 : 0;
if( GAMESTATE->m_pCurCourse ) // playing a course
{
if( GAMESTATE->m_bDifficultCourses )
m_iSelectedOption[p][PO_STEP] = 1;
else
m_iSelectedOption[p][PO_STEP] = 0;
}
else
{
vector<Notes*> vNotes;
GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
SortNotesArrayByDifficulty( vNotes );
for( unsigned i=0; i<vNotes.size(); i++ )
{
if( GAMESTATE->m_pCurNotes[p] == vNotes[i] )
m_iSelectedOption[p][PO_STEP] = i;
}
}
/* Default: */ /* Default: */
m_iSelectedOption[p][PO_PERSPECTIVE] = 1; m_iSelectedOption[p][PO_PERSPECTIVE] = 1;
if(po.m_fPerspectiveTilt == -1) if(po.m_fPerspectiveTilt == -1)
@@ -275,23 +294,22 @@ void ScreenPlayerOptions::ExportOptions()
GAMESTATE->m_PlayerOptions[p].m_sPositioning = m_OptionRow[PO_PERSPECTIVE].choices[choice]; GAMESTATE->m_PlayerOptions[p].m_sPositioning = m_OptionRow[PO_PERSPECTIVE].choices[choice];
} }
//
// apply difficulty selection
//
if( GAMESTATE->m_pCurCourse ) // playing a course if( GAMESTATE->m_pCurCourse ) // playing a course
{ {
if( GAMESTATE->m_bDifficultCourses ) if( m_iSelectedOption[p][PO_STEP] == 1 )
m_iSelectedOption[p][PO_STEP] = 1; GAMESTATE->m_bDifficultCourses = true;
else else
m_iSelectedOption[p][PO_STEP] = 0; GAMESTATE->m_bDifficultCourses = false;
} }
else else
{ {
vector<Notes*> vNotes; vector<Notes*> vNotes;
GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
SortNotesArrayByDifficulty( vNotes ); SortNotesArrayByDifficulty( vNotes );
for( unsigned i=0; i<vNotes.size(); i++ ) GAMESTATE->m_pCurNotes[p] = vNotes[ m_iSelectedOption[p][PO_STEP] ];
{
if( GAMESTATE->m_pCurNotes[p] == vNotes[i] )
m_iSelectedOption[p][PO_STEP] = i;
}
} }
if( m_iSelectedOption[p][PO_CHARACTER] > 0 ) if( m_iSelectedOption[p][PO_CHARACTER] > 0 )