From 7b9802b2bf2fa92632809699420de83e7fdca511 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 28 Apr 2004 23:42:23 +0000
Subject: [PATCH] remove "SaveToProfile"

---
 stepmania/src/ScreenOptionsMaster.cpp    | 38 ------------------------
 stepmania/src/ScreenOptionsMaster.h      |  2 --
 stepmania/src/ScreenOptionsMasterPrefs.h |  1 -
 3 files changed, 41 deletions(-)

diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index d9ecd36aec..b68ec0981e 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -196,15 +196,6 @@ void ScreenOptionsMaster::SetCharacter( OptionRowData &row, OptionRowHandler &ha
 	}
 }
 
-/* Add a list of available characters to the given row/handler. */
-void ScreenOptionsMaster::SetSaveToProfile( OptionRowData &row, OptionRowHandler &hand )
-{
-	hand.type = ROW_SAVE_TO_PROFILE;
-	row.bOneChoiceForAllPlayers = false;
-	row.choices.push_back( ENTRY_NAME("Don'tSave") );
-	row.choices.push_back( ENTRY_NAME("SaveToProfile") );
-}
-
 ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
 	ScreenOptions( sClassName )
 {
@@ -291,11 +282,6 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
 				SetCharacter( row, hand );
 				row.name = "Characters";
 			}
-			else if( !name.CompareNoCase("SaveToProfile") )
-			{
-				SetSaveToProfile( row, hand );
-				row.name = "Save To\nProfile";
-			}
 			else
 				RageException::Throw( "Unexpected type '%s' in %s::Line%i", name.c_str(), m_sName.c_str(), i );
 
@@ -393,10 +379,6 @@ void ScreenOptionsMaster::ImportOption( const OptionRowData &row, const OptionRo
 			return;
 		}
 
-	case ROW_SAVE_TO_PROFILE:
-		SelectExactlyOne( 0+(m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN?1:0), vbSelectedOut );
-		return;
-
 	default:
 		ASSERT(0);
 	}
@@ -504,22 +486,6 @@ int ScreenOptionsMaster::ExportOption( const OptionRowData &row, const OptionRow
 		}
 		break;
 
-	case ROW_SAVE_TO_PROFILE:
-		{
-			int sel = GetOneSelection(vbSelected) - (m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN?1:0);
-
-			if( sel == 1 )
-			{
-				if( PROFILEMAN->IsUsingProfile((PlayerNumber)pn) )
-				{
-					Profile* pProfile = PROFILEMAN->GetProfile((PlayerNumber)pn);
-					pProfile->m_bUsingProfileDefaultModifiers = true;
-					pProfile->m_sDefaultModifiers = GAMESTATE->m_PlayerOptions[pn].GetString();
-				}
-			}
-		}
-		break;
-
 	default:
 		ASSERT(0);
 		break;
@@ -599,10 +565,6 @@ void ScreenOptionsMaster::ExportOptions()
 		SOUNDMAN->SetPrefs( PREFSMAN->m_fSoundVolume );
 	}
 	
-	if( ChangeMask & OPT_SAVE_MODIFIERS_TO_PROFILE )
-	{
-		SOUNDMAN->SetPrefs( PREFSMAN->m_fSoundVolume );
-	}
 	CHECKPOINT;
 }
 
diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h
index 1192e49596..6ed2439b94 100644
--- a/stepmania/src/ScreenOptionsMaster.h
+++ b/stepmania/src/ScreenOptionsMaster.h
@@ -20,7 +20,6 @@ private:
 		ROW_STEP, /* list of steps for the current song or course */
 		ROW_CHARACTER, /* list of characters */
 		ROW_CONFIG,	/* global pref */
-		ROW_SAVE_TO_PROFILE, /* save new options to profile? */
 		NUM_OPTION_ROW_TYPES
 	};
 
@@ -49,7 +48,6 @@ private:
 	void SetStep( OptionRowData &row, OptionRowHandler &hand );
 	void SetConf( OptionRowData &row, OptionRowHandler &hand, CString param, CString &TitleOut );
 	void SetCharacter( OptionRowData &row, OptionRowHandler &hand );
-	void SetSaveToProfile( OptionRowData &row, OptionRowHandler &hand );
 
 protected:
 	virtual void ImportOptions();
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.h b/stepmania/src/ScreenOptionsMasterPrefs.h
index cedce95c0a..ad240d63ca 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.h
+++ b/stepmania/src/ScreenOptionsMasterPrefs.h
@@ -7,7 +7,6 @@ static const int MAX_OPTIONS=16;
 #define OPT_APPLY_THEME					0x4
 #define OPT_RESET_GAME					0x8
 #define OPT_APPLY_SOUND					0x16
-#define OPT_SAVE_MODIFIERS_TO_PROFILE	0x32
 
 struct ConfOption
 {