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();