From 7b646dc6b1f7949b4a5c420b91f6c24d0a3e28c7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Dec 2005 04:16:11 +0000 Subject: [PATCH] split SetNumSubdivisions --- stepmania/src/ActorScroller.cpp | 3 ++- stepmania/src/LuaExpressionTransform.cpp | 4 +--- stepmania/src/LuaExpressionTransform.h | 3 ++- stepmania/src/ScreenOptions.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index d18c6b4669..b7996daedc 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -54,7 +54,8 @@ void ActorScroller::Load3( ) { m_fNumItemsToDraw = fNumItemsToDraw; - m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions ); + m_exprTransformFunction.SetFromExpression( sTransformFunction ); + m_exprTransformFunction.SetNumSubdivisions( iSubdivisions ); m_bLoop = bLoop; m_iNumItems = m_SubActors.size(); } diff --git a/stepmania/src/LuaExpressionTransform.cpp b/stepmania/src/LuaExpressionTransform.cpp index 72271e08c5..b51034c475 100644 --- a/stepmania/src/LuaExpressionTransform.cpp +++ b/stepmania/src/LuaExpressionTransform.cpp @@ -10,11 +10,9 @@ LuaExpressionTransform::LuaExpressionTransform() m_iNumSubdivisions = 1; } -void LuaExpressionTransform::SetFromExpression( const CString &sExpression, int iNumSubdivisions ) +void LuaExpressionTransform::SetFromExpression( const CString &sExpression ) { - ASSERT( iNumSubdivisions > 0 ); m_pexprTransformFunction->SetFromExpression( sExpression ); - m_iNumSubdivisions = iNumSubdivisions; } const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const diff --git a/stepmania/src/LuaExpressionTransform.h b/stepmania/src/LuaExpressionTransform.h index 0799cc38a9..51b57031c8 100644 --- a/stepmania/src/LuaExpressionTransform.h +++ b/stepmania/src/LuaExpressionTransform.h @@ -12,7 +12,8 @@ class LuaExpressionTransform public: LuaExpressionTransform(); - void SetFromExpression( const CString &sExpression, int iNumSubdivisions ); + void SetFromExpression( const CString &sExpression ); + void SetNumSubdivisions( int iNumSubdivisions ) { ASSERT( iNumSubdivisions > 0 ); m_iNumSubdivisions = iNumSubdivisions; } void PositionItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ); const Actor::TweenState &GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const; diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 42562e8a56..ca15a14827 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -104,7 +104,7 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla m_OptionsNavigation = PREFSMAN->m_bArcadeOptionsNavigation? NAV_THREE_KEY:NAV_FIVE_KEY; m_InputMode = INPUTMODE_SHARE_CURSOR; - m_exprRowPositionTransformFunction .SetFromExpression( THEME->GetMetric(m_sName,"RowPositionTransformFunction"), 1 ); + m_exprRowPositionTransformFunction.SetFromExpression( THEME->GetMetric(m_sName,"RowPositionTransformFunction") ); }