From be73671d023dfd8e891a818e4e13e2fac0cd9a98 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 19 Sep 2005 09:55:05 +0000 Subject: [PATCH] cleanup --- stepmania/src/MusicWheel.cpp | 5 ++--- stepmania/src/WheelBase.cpp | 6 +++++- stepmania/src/WheelBase.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 50c8c8742f..706fe24631 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -739,7 +739,7 @@ void MusicWheel::RebuildAllMusicWheelItems() void MusicWheel::RebuildMusicWheelItems( int iDist ) { - vector &data = m_CurWheelItemData; + const vector &data = m_CurWheelItemData; vector &items = m_MusicWheelItems; // rewind to first index that will be displayed; @@ -816,12 +816,11 @@ void MusicWheel::NotesOrTrailChanged( PlayerNumber pn ) // update grade graphics void MusicWheel::DrawItem( int i ) { - MusicWheelItem *display = m_MusicWheelItems[i]; - const float fThisBannerPositionOffsetFromSelection = i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection; if( fabsf(fThisBannerPositionOffsetFromSelection) > NUM_WHEEL_ITEMS_TO_DRAW/2 ) return; + MusicWheelItem *display = m_MusicWheelItems[i]; switch( m_WheelState ) { case STATE_SELECTING: diff --git a/stepmania/src/WheelBase.cpp b/stepmania/src/WheelBase.cpp index a6bc95485e..8302fc2a4f 100644 --- a/stepmania/src/WheelBase.cpp +++ b/stepmania/src/WheelBase.cpp @@ -157,6 +157,10 @@ void WheelBase::DrawPrimitives() ActorFrame::DrawPrimitives(); } +void WheelBase::DrawItem( int i ) +{ + DrawItem( i, m_WheelBaseItems[i], i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection ); +} void WheelBase::DrawItem( int i, WheelItemBase *display, const float fThisBannerPositionOffsetFromSelection) { @@ -627,7 +631,7 @@ void WheelBase::BuildWheelItemsData( vector &arrayWheelItemD void WheelBase::RebuildWheelItems( int iDist ) { - vector &data = m_WheelBaseItemsData; + const vector &data = m_WheelBaseItemsData; vector &items = m_WheelBaseItems; // rewind to first index that will be displayed; diff --git a/stepmania/src/WheelBase.h b/stepmania/src/WheelBase.h index 3a860085bd..ca8923a0cd 100644 --- a/stepmania/src/WheelBase.h +++ b/stepmania/src/WheelBase.h @@ -24,8 +24,8 @@ public: virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); + virtual void DrawItem( int i ); virtual void DrawItem( int i, WheelItemBase *display, const float fThisBannerPositionOffsetFromSelection); - virtual void DrawItem( int i ) { DrawItem( i, m_WheelBaseItems[i], i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection ); } void TweenOnScreen(bool changing_sort); void TweenOffScreen(bool changing_sort);