From ec51d48b07147587f8a95feac5213817272c4a60 Mon Sep 17 00:00:00 2001 From: Dan Guzek Date: Thu, 6 Mar 2014 21:13:44 -0500 Subject: [PATCH 1/2] Remove unintuitive loop condition from ActorScroller --- src/ActorScroller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ActorScroller.cpp b/src/ActorScroller.cpp index 60c93bbe0a..d25dc86604 100644 --- a/src/ActorScroller.cpp +++ b/src/ActorScroller.cpp @@ -257,7 +257,7 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives ) iLastItemToDraw = clamp( iLastItemToDraw, 0, m_iNumItems ); } - bool bDelayedDraw = m_bDrawByZPosition && !m_bLoop; + bool bDelayedDraw = m_bDrawByZPosition; vector subs; { From 5f006ba119b71fd37815d0221defd80f6eb46291 Mon Sep 17 00:00:00 2001 From: Dan Guzek Date: Thu, 6 Mar 2014 21:16:52 -0500 Subject: [PATCH 2/2] Remove unused variable from ActorScroller --- src/ActorScroller.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ActorScroller.cpp b/src/ActorScroller.cpp index d25dc86604..faaece7ec2 100644 --- a/src/ActorScroller.cpp +++ b/src/ActorScroller.cpp @@ -257,7 +257,6 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives ) iLastItemToDraw = clamp( iLastItemToDraw, 0, m_iNumItems ); } - bool bDelayedDraw = m_bDrawByZPosition; vector subs; { @@ -291,14 +290,14 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives ) m_exprTransformFunction.TransformItemCached( *m_SubActors[iIndex], fPosition, iItem, m_iNumItems ); if( bDrawPrimitives ) { - if( bDelayedDraw ) + if( m_bDrawByZPosition ) subs.push_back( m_SubActors[iIndex] ); else m_SubActors[iIndex]->Draw(); } } - if( bDelayedDraw ) + if( m_bDrawByZPosition ) { ActorUtil::SortByZPosition( subs ); FOREACH( Actor*, subs, a )