From e6f9c503dd431560f43db8c3584f4acca1a38870 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 2 Mar 2011 14:37:16 -0600 Subject: [PATCH] and moving it into here. --- src/PlayerState.cpp | 20 ++++++++++++++++++++ src/PlayerState.h | 10 ++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/PlayerState.cpp b/src/PlayerState.cpp index 2525c60872..e66a311a35 100644 --- a/src/PlayerState.cpp +++ b/src/PlayerState.cpp @@ -189,6 +189,26 @@ int PlayerState::GetSumOfActiveAttackLevels() const return iSum; } +/* +void PlayerState::LoadNoteSkinMetrics() +{ + // Read metrics from current noteskin for setting row/col spacing and + // arrow size (originally from StepMania AMX) + + // steps must exist + ASSERT( GAMESTATE->m_pCurSteps[m_PlayerNumber] ); + + RString m_sNoteSkin = m_PlayerOptions.GetStage().m_sNoteSkin; + RString sStepsType = StringConversion::ToString( GAMESTATE->m_pCurSteps[m_PlayerNumber]->m_StepsType ); + LOG->Trace("Loading Row/Col/Size values for Noteskin %s | StepsType: %s",m_sNoteSkin.c_str(),sStepsType.c_str()); + + //m_iNoteSkinRowSpacing = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "RowSpacing" ); + // todo: allow per-column spacing values? -aj + m_iNoteSkinColSpacing = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ColSpacing" ); + m_iNoteSkinArrowSize = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ArrowSize" ); +} +*/ + // lua start #include "LuaBinding.h" diff --git a/src/PlayerState.h b/src/PlayerState.h index 06bd6acb35..86958d40d2 100644 --- a/src/PlayerState.h +++ b/src/PlayerState.h @@ -46,6 +46,16 @@ public: /** @brief The PlayerOptions presently in use by the Player. */ ModsGroup m_PlayerOptions; + // Metricable noteskin things + /* + void LoadNoteSkinMetrics(); + int m_iNoteSkinColSpacing; + int m_iNoteSkinArrowSize; + */ + // not sure I want to let noteskins change row spacing, as that changes how + // the speed mods work... -aj + //int m_iNoteSkinRowSpacing; + /** * @brief Used to push note-changing modifiers back so that notes don't pop. *