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

cleanups (working on cleaner ConfOption/Preference integration)

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-07 02:47:21 +00:00
parent d3180e8690
commit ed097b0a5d
4 changed files with 76 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
+9 -6
View File
@@ -159,10 +159,13 @@ void ScreenOptionsMaster::SetConf( OptionRowData &row, OptionRowHandler &hand, C
row.bOneChoiceForAllPlayers = true;
hand.type = ROW_CONFIG;
hand.opt = ConfOption::Find( param );
if( hand.opt == NULL )
ConfOption *pConfOption = ConfOption::Find( param );
if( pConfOption == NULL )
RageException::Throw( "Invalid Conf type \"%s\"", param.c_str() );
pConfOption->UpdateAvailableOptions();
hand.opt = pConfOption;
hand.opt->MakeOptionsList( row.choices );
row.name = hand.opt->name;
@@ -370,7 +373,7 @@ void ScreenOptionsMaster::ImportOption( const OptionRowData &row, const OptionRo
case ROW_CONFIG:
{
int iSelection = hand.opt->Get( row.choices );
int iSelection = hand.opt->Get();
SelectExactlyOne( iSelection+(m_OptionsNavigation==NAV_TOGGLE_THREE_KEY?1:0), vbSelectedOut );
return;
}
@@ -464,13 +467,13 @@ int ScreenOptionsMaster::ExportOption( const OptionRowData &row, const OptionRow
int sel = GetOneSelection(vbSelected) - (m_OptionsNavigation==NAV_TOGGLE_THREE_KEY?1:0);
/* Get the original choice. */
int Original = hand.opt->Get( row.choices );
int Original = hand.opt->Get();
/* Apply. */
hand.opt->Put( sel, row.choices );
hand.opt->Put( sel );
/* Get the new choice. */
int New = hand.opt->Get( row.choices );
int New = hand.opt->Get();
/* If it didn't change, don't return any side-effects. */
if( Original == New )