actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use the theme metric rather than "default".

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+1 -1
View File
@@ -1030,7 +1030,7 @@ void GameState::GetDefaultPlayerOptions( PlayerOptions &po )
po.FromString( PREFSMAN->m_sDefaultModifiers ); po.FromString( PREFSMAN->m_sDefaultModifiers );
po.FromString( CommonMetrics::DEFAULT_MODIFIERS ); po.FromString( CommonMetrics::DEFAULT_MODIFIERS );
if( po.m_sNoteSkin.empty() ) if( po.m_sNoteSkin.empty() )
po.m_sNoteSkin = "default"; po.m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME;
} }
void GameState::GetDefaultSongOptions( SongOptions &so ) void GameState::GetDefaultSongOptions( SongOptions &so )
stepmania/src/PlayerOptions.cpp
+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. // 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 != NOTESKIN->GAME_BASE_NOTESKIN_NAME.GetValue() )
if( !m_sNoteSkin.empty() && m_sNoteSkin != "default" )
{ {
RString s = m_sNoteSkin; RString s = m_sNoteSkin;
Capitalize( s ); 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 == "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( 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( 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 == "randomspeed" ) SET_FLOAT( fRandomSpeed )
else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD; else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD;
else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT; else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT;