From 2fb5052a48ff77fdc9c13dd7577ac64b78978ff8 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 14 Jan 2004 08:07:06 +0000 Subject: [PATCH] whoops! Fix all nav types other than FirstChoiceGoesDown --- stepmania/src/ScreenOptionsMaster.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 980524ce93..3ed3c7534b 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -372,12 +372,12 @@ void ScreenOptionsMaster::ImportOption( const OptionRowData &row, const OptionRo case ROW_CONFIG: { int iSelection = hand.opt->Get( row.choices ); - SelectExactlyOne( iSelection+(NAV_FIRST_CHOICE_GOES_DOWN?1:0), vbSelectedOut ); + SelectExactlyOne( iSelection+(m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN?1:0), vbSelectedOut ); return; } case ROW_SAVE_TO_PROFILE: - SelectExactlyOne( 0+(NAV_FIRST_CHOICE_GOES_DOWN?1:0), vbSelectedOut ); + SelectExactlyOne( 0+(m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN?1:0), vbSelectedOut ); return; default: @@ -450,7 +450,7 @@ int ScreenOptionsMaster::ExportOption( const OptionRowData &row, const OptionRow case ROW_CONFIG: { - int sel = GetOneSelection(vbSelected) - (NAV_FIRST_CHOICE_GOES_DOWN?1:0); + int sel = GetOneSelection(vbSelected) - (m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN?1:0); /* Get the original choice. */ int Original = hand.opt->Get( row.choices ); @@ -471,7 +471,7 @@ int ScreenOptionsMaster::ExportOption( const OptionRowData &row, const OptionRow case ROW_SAVE_TO_PROFILE: { - int sel = GetOneSelection(vbSelected) - (NAV_FIRST_CHOICE_GOES_DOWN?1:0); + int sel = GetOneSelection(vbSelected) - (m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN?1:0); if( sel == 1 ) {