diff --git a/src/PlayerState.cpp b/src/PlayerState.cpp index 4a12a613ac..2525c60872 100644 --- a/src/PlayerState.cpp +++ b/src/PlayerState.cpp @@ -5,7 +5,6 @@ #include "RageLog.h" #include "RadarValues.h" #include "Steps.h" -//#include "NoteSkinManager.h" // not needed yet, but will be soon -aj PlayerState::PlayerState() { @@ -29,9 +28,6 @@ void PlayerState::Reset() m_iCpuSkill = 5; - m_iNoteSkinColSpacing = 0; - m_iNoteSkinArrowSize = 0; - m_iLastPositiveSumOfAttackLevels = 0; m_fSecondsUntilAttacksPhasedOut = 0; m_bAttackBeganThisUpdate = false; @@ -193,27 +189,6 @@ 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 f5d4ceff22..06bd6acb35 100644 --- a/src/PlayerState.h +++ b/src/PlayerState.h @@ -46,14 +46,6 @@ public: /** @brief The PlayerOptions presently in use by the Player. */ ModsGroup m_PlayerOptions; - // Metricable noteskin stuff - 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. *