From 97ddf1ca86700a8a7e4e6969731b4a5ab19438ce Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 19 Sep 2005 09:20:57 +0000 Subject: [PATCH] cleanup --- stepmania/src/WheelBase.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/stepmania/src/WheelBase.cpp b/stepmania/src/WheelBase.cpp index ff396c76bc..05b8f500bc 100644 --- a/stepmania/src/WheelBase.cpp +++ b/stepmania/src/WheelBase.cpp @@ -541,7 +541,7 @@ void WheelBase::Move(int n) m_SpinSpeed = float(PREFSMAN->m_iMusicWheelSwitchSpeed); m_Moving = n; - if(m_Moving) + if( m_Moving ) ChangeMusic(m_Moving); } @@ -581,12 +581,11 @@ bool WheelBase::MoveSpecific( int n ) return true; } -void WheelBase::AddItem(WheelItemBaseData* itemdata) +void WheelBase::AddItem( WheelItemBaseData* pItemData ) { - int visible, index; - m_WheelBaseItemsData.push_back(itemdata); - visible = FirstVisibleIndex(); - index = m_WheelBaseItemsData.size(); + m_WheelBaseItemsData.push_back( pItemData ); + int iVisible = FirstVisibleIndex(); + int iIndex = m_WheelBaseItemsData.size(); if( m_isEmpty ) { @@ -596,7 +595,7 @@ void WheelBase::AddItem(WheelItemBaseData* itemdata) } // If the item was shown in the wheel, rebuild the wheel - if( (0 <= (index - visible)) && ((index - visible) < NUM_WHEEL_ITEMS) ) + if( 0 <= iIndex - iVisible && iIndex - iVisible < NUM_WHEEL_ITEMS ) { RebuildWheelItems(); }