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

[br:warps] bring in changes from default branch

Browse Source
This commit is contained in:
AJ Kelly
2011-03-25 16:05:11 -05:00
parent b94ff7785f 0f6d954066
commit e27c58cd07
6 changed files with 78 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheelItem.cpp
+2 -2
View File
@@ -124,7 +124,6 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
WheelItemBase( cpy ),
GRADES_SHOW_MACHINE( cpy.GRADES_SHOW_MACHINE ),
m_TextBanner( cpy.m_TextBanner ),
m_pTextSectionCount( cpy.m_pTextSectionCount ),
m_WheelNotifyIcon( cpy.m_WheelNotifyIcon )
{
FOREACH_ENUM( MusicWheelItemType, i )
@@ -157,7 +156,7 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
}
}
//m_pTextSectionCount = new BitmapText( *cpy.m_pTextSectionCount );
m_pTextSectionCount = new BitmapText( *cpy.m_pTextSectionCount );
this->AddChild( m_pTextSectionCount );
this->AddChild( &m_WheelNotifyIcon );
@@ -171,6 +170,7 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
MusicWheelItem::~MusicWheelItem()
{
delete m_pTextSectionCount;
}
void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pData, int iIndex, bool bHasFocus, int iDrawIndex )