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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-29 06:28:17 +00:00
parent 31355281e0
commit b4a791c063
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMasterPrefs.cpp
+24 -21
View File
@@ -13,6 +13,23 @@
#include "GameState.h" #include "GameState.h"
#include "InputMapper.h" #include "InputMapper.h"
static void GetDefaultModifiers( PlayerOptions &po, SongOptions &so )
{
po.FromString( PREFSMAN->m_sDefaultModifiers );
so.FromString( PREFSMAN->m_sDefaultModifiers );
}
static void SetDefaultModifiers( const PlayerOptions &po, const SongOptions &so )
{
CStringArray as;
if( po.GetString() != "" )
as.push_back( po.GetString() );
if( so.GetString() != "" )
as.push_back( so.GetString() );
PREFSMAN->m_sDefaultModifiers = join(", ",as);
}
/* "sel" is the selection in the menu. */ /* "sel" is the selection in the menu. */
template<class T> template<class T>
static void MoveData( int &sel, T &opt, bool ToSel ) static void MoveData( int &sel, T &opt, bool ToSel )
@@ -150,21 +167,11 @@ static void DefaultNoteSkin( int &sel, bool ToSel, const CStringArray &choices )
if( !stricmp(choices[i], po.m_sNoteSkin) ) if( !stricmp(choices[i], po.m_sNoteSkin) )
sel = i; sel = i;
} else { } else {
CString sModifiers = PREFSMAN->m_sDefaultModifiers;
PlayerOptions po; PlayerOptions po;
po.FromString( sModifiers );
SongOptions so; SongOptions so;
so.FromString( sModifiers ); GetDefaultModifiers( po, so );
po.m_sNoteSkin = choices[sel]; po.m_sNoteSkin = choices[sel];
SetDefaultModifiers( po, so );
CStringArray as;
if( po.GetString() != "" )
as.push_back( po.GetString() );
if( so.GetString() != "" )
as.push_back( so.GetString() );
PREFSMAN->m_sDefaultModifiers = join(", ",as);
} }
} }
@@ -302,24 +309,20 @@ static void DefaultFailType( int &sel, bool ToSel, const CStringArray &choices )
so.FromString( PREFSMAN->m_sDefaultModifiers ); so.FromString( PREFSMAN->m_sDefaultModifiers );
sel = so.m_FailType; sel = so.m_FailType;
} else { } else {
CString sModifiers = PREFSMAN->m_sDefaultModifiers;
PlayerOptions po; PlayerOptions po;
po.FromString( sModifiers );
SongOptions so; SongOptions so;
so.FromString( sModifiers ); GetDefaultModifiers( po, so );
switch( sel ) switch( sel )
{ {
case 0: so.m_FailType = SongOptions::FAIL_ARCADE; break; case 0: so.m_FailType = SongOptions::FAIL_ARCADE; break;
case 1: so.m_FailType = SongOptions::FAIL_END_OF_SONG; break; case 1: so.m_FailType = SongOptions::FAIL_END_OF_SONG; break;
case 2: so.m_FailType = SongOptions::FAIL_OFF; break; case 2: so.m_FailType = SongOptions::FAIL_OFF; break;
default: default:
ASSERT(0); ASSERT(0);
} }
CStringArray as;
if( po.GetString() != "" ) SetDefaultModifiers( po, so );
as.push_back( po.GetString() );
if( so.GetString() != "" )
as.push_back( so.GetString() );
} }
} }