actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

nudge RebuildWheelItems and RebuildMusicWheelItems together

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-19 09:37:47 +00:00
parent 3dac531b1d
commit d2616b08d9
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+7 -7
View File
@@ -737,7 +737,7 @@ void MusicWheel::RebuildAllMusicWheelItems()
RebuildMusicWheelItems( INT_MAX ); RebuildMusicWheelItems( INT_MAX );
} }
void MusicWheel::RebuildMusicWheelItems( int dist ) void MusicWheel::RebuildMusicWheelItems( int iDist )
{ {
// rewind to first index that will be displayed; // rewind to first index that will be displayed;
int iFirstVisibleIndex = m_iSelection; int iFirstVisibleIndex = m_iSelection;
@@ -752,7 +752,7 @@ void MusicWheel::RebuildMusicWheelItems( int dist )
// iIndex is now the index of the lowest WheelItem to draw // iIndex is now the index of the lowest WheelItem to draw
if( dist == INT_MAX ) if( iDist == INT_MAX )
{ {
// Refresh all // Refresh all
for( int i=0; i<NUM_WHEEL_ITEMS; i++ ) for( int i=0; i<NUM_WHEEL_ITEMS; i++ )
@@ -770,10 +770,10 @@ void MusicWheel::RebuildMusicWheelItems( int dist )
else else
{ {
// Shift items and refresh only those that have changed. // Shift items and refresh only those that have changed.
CircularShift( m_MusicWheelItems, dist ); CircularShift( m_MusicWheelItems, iDist );
if( dist > 0 ) if( iDist > 0 )
{ {
for( int i=NUM_WHEEL_ITEMS-dist; i<NUM_WHEEL_ITEMS; i++ ) for( int i=NUM_WHEEL_ITEMS-iDist; i<NUM_WHEEL_ITEMS; i++ )
{ {
int iIndex = iFirstVisibleIndex + i; int iIndex = iFirstVisibleIndex + i;
wrap( iIndex, m_CurWheelItemData.size() ); wrap( iIndex, m_CurWheelItemData.size() );
@@ -785,9 +785,9 @@ void MusicWheel::RebuildMusicWheelItems( int dist )
display->LoadFromWheelItemData( data, bExpanded ); display->LoadFromWheelItemData( data, bExpanded );
} }
} }
else if( dist < 0 ) else if( iDist < 0 )
{ {
for( int i=0; i<-dist; i++ ) for( int i=0; i < -iDist; i++ )
{ {
int iIndex = iFirstVisibleIndex + i; int iIndex = iFirstVisibleIndex + i;
wrap( iIndex, m_CurWheelItemData.size() ); wrap( iIndex, m_CurWheelItemData.size() );
stepmania/src/WheelBase.cpp
+2
View File
@@ -677,8 +677,10 @@ void WheelBase::RebuildWheelItems( int iDist )
{ {
int iIndex = iFirstVisibleIndex + i; int iIndex = iFirstVisibleIndex + i;
wrap( iIndex, m_WheelBaseItemsData.size() ); wrap( iIndex, m_WheelBaseItemsData.size() );
WheelItemBaseData *data = m_WheelBaseItemsData[iIndex]; WheelItemBaseData *data = m_WheelBaseItemsData[iIndex];
WheelItemBase *display = m_WheelBaseItems[i]; WheelItemBase *display = m_WheelBaseItems[i];
display->LoadFromWheelItemBaseData( data ); display->LoadFromWheelItemBaseData( data );
} }
} }
stepmania/src/WheelBase.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
virtual bool Select(); // return true if this selection ends the screen virtual bool Select(); // return true if this selection ends the screen
bool WheelIsLocked() { return (m_WheelState == STATE_LOCKED ? true : false); } bool WheelIsLocked() { return (m_WheelState == STATE_LOCKED ? true : false); }
virtual void RebuildWheelItems( int dist = -999999 ); // -999999 = refresh all virtual void RebuildWheelItems( int dist = INT_MAX ); // INT_MAX = refresh all
void AddItem( WheelItemBaseData* itemdata ); void AddItem( WheelItemBaseData* itemdata );
virtual void RemoveItem( int index ); virtual void RemoveItem( int index );