From 8c6575ecbb9fb2af24f2aa504188f0c2a93fe674 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 18 Aug 2006 00:09:09 +0000 Subject: [PATCH] PlayerOption po1; // Initialize it. PlayerOption po2; po2.FromString( po1.GetString() ); po2 does not necessarily equal po1 because the note skin might be omitted so po2's note skin will be blank. Passing true to GetString() will include the note skin so po2.FromString( po1.GetString(true) ) will cause po2 to equal po1. --- stepmania/src/PlayerOptions.cpp | 10 +++++----- stepmania/src/PlayerOptions.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index dbe076cd5f..4b38bc59e0 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -76,14 +76,14 @@ static void AddPart( vector &AddTo, float level, RString name ) AddTo.push_back( LevelStr + name ); } -RString PlayerOptions::GetString() const +RString PlayerOptions::GetString( bool bForceNoteSkin ) const { vector v; - GetMods( v ); + GetMods( v, bForceNoteSkin ); return join( ", ", v ); } -void PlayerOptions::GetMods( vector &AddTo ) const +void PlayerOptions::GetMods( vector &AddTo, bool bForceNoteSkin ) const { RString sReturn; @@ -195,8 +195,8 @@ void PlayerOptions::GetMods( vector &AddTo ) const AddPart( AddTo, m_fSkew, "Incoming" ); } - // Don't display a string if using the default NoteSkin. - if( !m_sNoteSkin.empty() && m_sNoteSkin != NOTESKIN->GAME_BASE_NOTESKIN_NAME.GetValue() ) + // Don't display a string if using the default NoteSkin unless we force it. + if( bForceNoteSkin || (!m_sNoteSkin.empty() && m_sNoteSkin != NOTESKIN->GAME_BASE_NOTESKIN_NAME.GetValue()) ) { RString s = m_sNoteSkin; Capitalize( s ); diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h index 146525d02a..c77933b8fe 100644 --- a/stepmania/src/PlayerOptions.h +++ b/stepmania/src/PlayerOptions.h @@ -16,10 +16,10 @@ public: PlayerOptions() { Init(); }; void Init(); void Approach( const PlayerOptions& other, float fDeltaSeconds ); - RString GetString() const; + RString GetString( bool bForceNoteSkin = false ) const; RString GetSavedPrefsString() const; // only the basic options that players would want for every song void ResetSavedPrefs(); - void GetMods( vector &AddTo ) const; + void GetMods( vector &AddTo, bool bForceNoteSkin = false ) const; void GetLocalizedMods( vector &AddTo ) const; void FromString( const RString &sOptions, bool bWarnOnInvalid = false ); void ChooseRandomModifiers();