Use the theme metric rather than "default".

This commit is contained in:
Steve Checkoway
2006-05-20 09:00:09 +00:00
parent df6d8cb6ba
commit 9da602cec4
2 changed files with 3 additions and 4 deletions
+2 -3
View File
@@ -194,8 +194,7 @@ void PlayerOptions::GetMods( vector<RString> &AddTo ) const
}
// Don't display a string if using the default NoteSkin.
// TODO: The default NoteSkin is not necessarily called "default".
if( !m_sNoteSkin.empty() && m_sNoteSkin != "default" )
if( !m_sNoteSkin.empty() && m_sNoteSkin != NOTESKIN->GAME_BASE_NOTESKIN_NAME.GetValue() )
{
RString s = m_sNoteSkin;
Capitalize( s );
@@ -337,7 +336,7 @@ void PlayerOptions::FromString( const RString &sOptions, bool bWarnOnInvalid )
else if( sBit == "hallway" ) { m_bSetTiltOrSkew = true; m_fSkew = 0; m_fPerspectiveTilt = -level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
else if( sBit == "distant" ) { m_bSetTiltOrSkew = true; m_fSkew = 0; m_fPerspectiveTilt = +level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; }
else if( NOTESKIN && NOTESKIN->DoesNoteSkinExist(sBit) ) m_sNoteSkin = sBit;
else if( sBit == "noteskin" && !on ) /* "no noteskin" */ m_sNoteSkin = "default"; // TODO: The default NoteSkin isn't necessarily "default"
else if( sBit == "noteskin" && !on ) /* "no noteskin" */ m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME;
else if( sBit == "randomspeed" ) SET_FLOAT( fRandomSpeed )
else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD;
else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT;