From 0b13f2f5a5e8b69b9b718cad9ce36fa6a6d0c3ef Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 15 Feb 2011 23:44:36 -0600 Subject: [PATCH] working towards issue 24 http://ssc.ajworld.net/sm-ssc/bugtracker/view.php?id=24 --- src/GameState.cpp | 18 ++++++++++++++++-- src/GameState.h | 16 +++++++++++----- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index 0a190e750e..61fcc69f45 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -1389,8 +1389,6 @@ StageResult GameState::GetStageResult( PlayerNumber pn ) const return win; } - - void GameState::GetDefaultPlayerOptions( PlayerOptions &po ) { po.Init(); @@ -1450,6 +1448,22 @@ bool GameState::CurrentOptionsDisqualifyPlayer( PlayerNumber pn ) return po.IsEasierForSongAndSteps( m_pCurSong, m_pCurSteps[pn], pn); } +/* +void GameState::LoadNoteSkinMetrics( PlayerNumber pn ) +{ + // Read metrics from current noteskin for setting row/col spacing and + // arrow size (originally from StepMania AMX) + if( !IsPlayerEnabled( pn ) ) + return; + + ASSERT( this->m_pCurSteps[pn] ); + + RString m_sNoteSkin = m_pPlayerState[pn]->m_PlayerOptions.GetStage().m_sNoteSkin; + RString sStepsType = StringConversion::ToString( this->m_pCurSteps[pn]->m_StepsType ); + LOG->Trace("Loading Row/Col/Size values for Noteskin %s | StepsType: %s",m_sNoteSkin.c_str(),sStepsType.c_str()); +} +*/ + /* reset noteskins (?) * GameState::ResetNoteSkins() * GameState::ResetNoteSkinsForPlayer( PlayerNumber pn ) diff --git a/src/GameState.h b/src/GameState.h index 370f789a6c..72c3d57ad8 100644 --- a/src/GameState.h +++ b/src/GameState.h @@ -123,7 +123,6 @@ public: bool IsCpuPlayer( PlayerNumber pn ) const; bool AnyPlayersAreCpu() const; - bool IsCourseMode() const; bool IsBattleMode() const; // not Rave @@ -214,10 +213,17 @@ public: BroadcastOnChange m_bGameplayLeadIn; // Metricable noteskin things - // void LoadNoteSkinMetrics( PlayerNumber pn ); - // int m_iRowSpacing; - // int m_iColSpacing; - // int m_iArrowSize; + /* + void LoadNoteSkinMetrics( PlayerNumber pn ); + int m_iNoteSkinColSpacing[NUM_PLAYERS]; + int m_iNoteSkinArrowSize[NUM_PLAYERS]; + */ + // not sure I want to let noteskins change row spacing, as that changes how + // the speed mods work... -aj + //int m_iNoteSkinRowSpacing[NUM_PLAYERS]; + // what are these for, exactly? -aj + //bool m_bNoteSkinOverrideDim[NUM_PLAYERS]; + //bool m_bNoteSkinOverrideBright[NUM_PLAYERS]; float m_fMusicSecondsVisible; float m_fSongBeatVisible;