From 7567d21a9e2976667f1021fb879d73a2ea99eaed Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 2 Mar 2011 14:37:05 -0600 Subject: [PATCH] moving some stuff out of here --- src/GameState.cpp | 21 --------------------- src/GameState.h | 10 ---------- 2 files changed, 31 deletions(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index 08ca8205ea..4c526b150b 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -1447,27 +1447,6 @@ 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()); - - //m_iNoteSkinRowSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "RowSpacing" ); - // todo: allow per-column spacing values? -aj - m_iNoteSkinColSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ColSpacing" ); - m_iNoteSkinArrowSize[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ArrowSize" ); -} -*/ - /* reset noteskins (?) * GameState::ResetNoteSkins() * GameState::ResetNoteSkinsForPlayer( PlayerNumber pn ) diff --git a/src/GameState.h b/src/GameState.h index 2aef08cc0d..56625a888c 100644 --- a/src/GameState.h +++ b/src/GameState.h @@ -214,16 +214,6 @@ public: RageTimer m_LastBeatUpdate; // time of last m_fSongBeat, etc. update BroadcastOnChange m_bGameplayLeadIn; - // Metricable noteskin things - /* - 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]; - float m_fMusicSecondsVisible; float m_fSongBeatVisible;