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

more wheel fixes

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-10 05:09:14 +00:00
parent 16e51def6e
commit a5253821a3
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/WheelItemBase.cpp
+4 -2
View File
@@ -14,7 +14,8 @@ WheelItemBase::WheelItemBase( const WheelItemBase &cpy ):
m_sprBar( cpy.m_sprBar ), m_sprBar( cpy.m_sprBar ),
m_text( cpy.m_text ), m_text( cpy.m_text ),
m_Type( cpy.m_Type ), m_Type( cpy.m_Type ),
m_color( cpy.m_color ) m_color( cpy.m_color ),
m_bExpanded( cpy.m_bExpanded )
{ {
if( cpy.m_pBar == const_cast<Sprite *> (&cpy.m_sprBar) ) if( cpy.m_pBar == const_cast<Sprite *> (&cpy.m_sprBar) )
m_pBar = &m_sprBar; m_pBar = &m_sprBar;
@@ -28,6 +29,7 @@ WheelItemBase::WheelItemBase( const WheelItemBase &cpy ):
WheelItemBase::WheelItemBase(RString sType) WheelItemBase::WheelItemBase(RString sType)
{ {
m_bExpanded = false;
SetName( sType ); SetName( sType );
m_pBar = NULL; m_pBar = NULL;
Load(sType); Load(sType);
@@ -53,7 +55,7 @@ void WheelItemBase::Load( RString sType )
this->AddChild( &m_text ); this->AddChild( &m_text );
} }
void WheelItemBase::LoadFromWheelItemBaseData( WheelItemBaseData* pWID ) void WheelItemBase::LoadFromWheelItemData( const WheelItemBaseData* pWID )
{ {
ASSERT( pWID != NULL ); ASSERT( pWID != NULL );
stepmania/src/WheelItemBase.h
+5 -2
View File
@@ -29,18 +29,21 @@ public:
WheelItemBase( RString sType = "WheelItemBase" ); WheelItemBase( RString sType = "WheelItemBase" );
WheelItemBase( const WheelItemBase &cpy ); WheelItemBase( const WheelItemBase &cpy );
virtual void DrawPrimitives(); virtual void DrawPrimitives();
virtual Actor *Copy() const { return new WheelItemBase(*this); }
void Load( RString sType ); void Load( RString sType );
void DrawGrayBar( Actor& bar ); void DrawGrayBar( Actor& bar );
void SetExpanded( bool bExpanded ) { m_bExpanded = bExpanded; }
virtual void LoadFromWheelItemBaseData( WheelItemBaseData* pWID ); virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
RageColor m_colorLocked; RageColor m_colorLocked;
protected: protected:
void SetGrayBar( Actor *pBar ) { m_pBar = pBar; } void SetGrayBar( Actor *pBar ) { m_pBar = pBar; }
WheelItemBaseData* data; const WheelItemBaseData* data;
bool m_bExpanded; // if TYPE_SECTION, whether this section is expanded
Actor *m_pBar; Actor *m_pBar;
Sprite m_sprBar; Sprite m_sprBar;