From ef9f53d5145febfda58ff68f2b278d67c993e2bc Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 25 Jun 2003 04:51:41 +0000 Subject: [PATCH] fix default note skin option --- stepmania/src/ScreenAppearanceOptions.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp index 98825ec59c..8d406016a3 100644 --- a/stepmania/src/ScreenAppearanceOptions.cpp +++ b/stepmania/src/ScreenAppearanceOptions.cpp @@ -128,9 +128,11 @@ void ScreenAppearanceOptions::ImportOptions() } // highlight currently selected skin + PlayerOptions po; + po.FromString( PREFSMAN->m_sDefaultModifiers ); m_iSelectedOption[0][AO_SKIN] = 0; for( i=0; im_sDefaultNoteSkin) ) + if( 0==stricmp(m_OptionRow[AO_SKIN].choices[i], po.m_sNoteSkin) ) m_iSelectedOption[0][AO_SKIN] = i; @@ -166,7 +168,19 @@ void ScreenAppearanceOptions::ExportOptions() int iSelectedSkin = m_iSelectedOption[0][AO_SKIN]; CString sNewSkin = m_OptionRow[AO_SKIN].choices[iSelectedSkin]; - PREFSMAN->m_sDefaultNoteSkin = sNewSkin; + CString sModifiers = PREFSMAN->m_sDefaultModifiers; + PlayerOptions po; + po.FromString( sModifiers ); + SongOptions so; + so.FromString( sModifiers ); + po.m_sNoteSkin = sNewSkin; + CStringArray as; + if( po.GetString() != "" ) + as.push_back( po.GetString() ); + if( so.GetString() != "" ) + as.push_back( so.GetString() ); + PREFSMAN->m_sDefaultModifiers = join(", ",as); + PREFSMAN->m_bInstructions = !!m_iSelectedOption[0][AO_INSTRUCTIONS]; PREFSMAN->m_bShowDontDie = !!m_iSelectedOption[0][AO_CAUTION]; PREFSMAN->m_bShowSelectGroup = !!m_iSelectedOption[0][AO_SELECT_GROUP];