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

Use m_CurWheelItemData not m_WheelBaseItemsData

Browse Source
This commit is contained in:
Josh Allen
2006-08-13 18:19:54 +00:00
parent c8a037bc65
commit 82824c8c7d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RoomWheel.cpp
+11 -11
View File
@@ -10,9 +10,9 @@ AutoScreenMessage( SM_BackFromRoomName )
RoomWheel::~RoomWheel() RoomWheel::~RoomWheel()
{ {
FOREACH( WheelItemBaseData*, m_WheelBaseItemsData, i ) FOREACH( WheelItemBaseData*, m_CurWheelItemData, i )
SAFE_DELETE( *i ); SAFE_DELETE( *i );
m_WheelBaseItemsData.clear(); m_CurWheelItemData.clear();
} }
void RoomWheel::Load( RString sType ) void RoomWheel::Load( RString sType )
@@ -28,7 +28,7 @@ void RoomWheel::Load( RString sType )
AddPerminateItem( new RoomWheelData(TYPE_GENERIC, "Create Room", "Create a new game room", THEME->GetMetricC( m_sName, "CreateRoomColor")) ); AddPerminateItem( new RoomWheelData(TYPE_GENERIC, "Create Room", "Create a new game room", THEME->GetMetricC( m_sName, "CreateRoomColor")) );
BuildWheelItemsData( m_WheelBaseItemsData ); BuildWheelItemsData( m_CurWheelItemData );
RebuildWheelItems(); RebuildWheelItems();
} }
@@ -81,9 +81,9 @@ void RoomWheel::AddPerminateItem(RoomWheelData* itemdata)
void RoomWheel::AddItem( WheelItemBaseData* pItemData ) void RoomWheel::AddItem( WheelItemBaseData* pItemData )
{ {
m_WheelBaseItemsData.push_back( pItemData ); m_CurWheelItemData.push_back( pItemData );
int iVisible = FirstVisibleIndex(); int iVisible = FirstVisibleIndex();
int iIndex = m_WheelBaseItemsData.size(); int iIndex = m_CurWheelItemData.size();
if( m_bEmpty ) if( m_bEmpty )
{ {
@@ -103,10 +103,10 @@ void RoomWheel::RemoveItem( int index )
{ {
index += m_offset; index += m_offset;
if( m_bEmpty || index >= (int)m_WheelBaseItemsData.size() ) if( m_bEmpty || index >= (int)m_CurWheelItemData.size() )
return; return;
vector<WheelItemBaseData *>::iterator i = m_WheelBaseItemsData.begin(); vector<WheelItemBaseData *>::iterator i = m_CurWheelItemData.begin();
i += index; i += index;
// If this item's data happened to be last selected, make it NULL. // If this item's data happened to be last selected, make it NULL.
@@ -114,12 +114,12 @@ void RoomWheel::RemoveItem( int index )
m_LastSelection = NULL; m_LastSelection = NULL;
SAFE_DELETE( *i ); SAFE_DELETE( *i );
m_WheelBaseItemsData.erase(i); m_CurWheelItemData.erase(i);
if( m_WheelBaseItemsData.size() < 1 ) if( m_CurWheelItemData.size() < 1 )
{ {
m_bEmpty = true; m_bEmpty = true;
m_WheelBaseItemsData.push_back( new WheelItemBaseData(TYPE_GENERIC, "- EMPTY -", RageColor(1,0,0,1)) ); m_CurWheelItemData.push_back( new WheelItemBaseData(TYPE_GENERIC, "- EMPTY -", RageColor(1,0,0,1)) );
} }
RebuildWheelItems(); RebuildWheelItems();
@@ -166,7 +166,7 @@ void RoomWheel::Move(int n)
unsigned int RoomWheel::GetNumItems() const unsigned int RoomWheel::GetNumItems() const
{ {
return m_WheelBaseItemsData.size() - m_offset; return m_CurWheelItemData.size() - m_offset;
} }
RoomInfoDisplay::~RoomInfoDisplay() RoomInfoDisplay::~RoomInfoDisplay()