From 0581e0b3d0f2ae1e8f349740ab94c309d69486a7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Sep 2005 00:51:35 +0000 Subject: [PATCH] const fix hide implementation --- stepmania/src/ActorScroller.cpp | 2 +- stepmania/src/ActorScroller.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index 593edc8de7..e4f34b6368 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -112,7 +112,7 @@ void ActorScroller::ScrollThroughAllItems() m_fDestinationItem = (float)(m_SubActors.size()+m_fNumItemsToDraw/2+1); } -float ActorScroller::GetSecondsForCompleteScrollThrough() +float ActorScroller::GetSecondsForCompleteScrollThrough() const { float fTotalItems = m_fNumItemsToDraw + m_SubActors.size(); return fTotalItems * (m_fSecondsPerItem + m_fSecondsPauseBetweenItems ); diff --git a/stepmania/src/ActorScroller.h b/stepmania/src/ActorScroller.h index cfe7060780..f3b74ded50 100644 --- a/stepmania/src/ActorScroller.h +++ b/stepmania/src/ActorScroller.h @@ -40,12 +40,11 @@ public: void SetDestinationItem( float fItemIndex ) { m_fDestinationItem = fItemIndex; } void SetCurrentAndDestinationItem( float fItemIndex ) { m_fCurrentItem = m_fDestinationItem = fItemIndex; } - float GetCurrentItem() { return m_fCurrentItem; } - float GetDestinationItem() { return m_fDestinationItem; } + float GetCurrentItem() const { return m_fCurrentItem; } + float GetDestinationItem() const { return m_fDestinationItem; } void ScrollThroughAllItems(); void SetPauseCountdownSeconds( float fSecs ) { m_fPauseCountdownSeconds = fSecs; } - - float GetSecondsForCompleteScrollThrough(); + float GetSecondsForCompleteScrollThrough() const; // // Commands @@ -57,6 +56,7 @@ protected: const Actor::TweenState &GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ); +private: bool m_bLoaded; float m_fCurrentItem; // Item at top of list, usually between 0 and m_SubActors.size(), approaches destination float m_fDestinationItem;