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

blank m_sNoteSkin mean "no change in NoteSkin". Don't hardcode the NoteSkin "default" everywhere because "default" is not guaranteed to exist.

Browse Source
This commit is contained in:
Chris Danford
2006-02-22 17:15:13 +00:00
parent 7da80cdaa2
commit 0e12a206f4
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+4 -1
View File
@@ -1016,6 +1016,8 @@ void GameState::GetDefaultPlayerOptions( PlayerOptions &po )
po.Init(); po.Init();
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() )
po.m_sNoteSkin = "default";
} }
void GameState::GetDefaultSongOptions( SongOptions &so ) void GameState::GetDefaultSongOptions( SongOptions &so )
@@ -1106,7 +1108,8 @@ void GameState::GetAllUsedNoteSkins( vector<RString> &out ) const
{ {
PlayerOptions po; PlayerOptions po;
po.FromString( e->Modifiers ); po.FromString( e->Modifiers );
out.push_back( po.m_sNoteSkin ); if( !po.m_sNoteSkin.empty() )
out.push_back( po.m_sNoteSkin );
} }
} }
} }
stepmania/src/PlayerOptions.cpp
+3 -3
View File
@@ -36,7 +36,7 @@ void PlayerOptions::Init()
ZERO( m_bTurns ); ZERO( m_bTurns );
ZERO( m_bTransforms ); ZERO( m_bTransforms );
m_ScoreDisplay = SCORING_ADD; m_ScoreDisplay = SCORING_ADD;
m_sNoteSkin = "default"; m_sNoteSkin = "";
} }
void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds ) void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds )
@@ -192,7 +192,7 @@ void PlayerOptions::GetMods( vector<RString> &AddTo ) const
AddPart( AddTo, m_fSkew, "Incoming" ); AddPart( AddTo, m_fSkew, "Incoming" );
} }
if( !m_sNoteSkin.empty() && m_sNoteSkin.CompareNoCase("default")!=0 ) if( !m_sNoteSkin.empty() )
{ {
RString s = m_sNoteSkin; RString s = m_sNoteSkin;
Capitalize( s ); Capitalize( s );
@@ -333,7 +333,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"; else if( sBit == "noteskin" && !on ) /* "no noteskin" */ m_sNoteSkin = "default"; // TODO: The default NoteSkin isn't necessarily "default"
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;
stepmania/src/PlayerOptions.h
+1 -1
View File
@@ -134,7 +134,7 @@ public:
bool m_bTransforms[NUM_TRANSFORMS]; bool m_bTransforms[NUM_TRANSFORMS];
ScoreDisplay m_ScoreDisplay; ScoreDisplay m_ScoreDisplay;
RString m_sNoteSkin; RString m_sNoteSkin; // "" means "no change"
void NextAccel(); void NextAccel();
void NextEffect(); void NextEffect();