[ScreenNetSelectMusic] StepsDisplay changed to load from StepsDisplayNet.
[RoomWheel] Added OverPart (just like in MusicWheel).
This commit is contained in:
@@ -56,6 +56,7 @@ RoomWheelItem::RoomWheelItem( const RoomWheelItem &cpy ):
|
||||
WheelItemBase( cpy ),
|
||||
m_sprNormalPart( cpy.m_sprNormalPart ),
|
||||
m_sprColorPart( cpy.m_sprColorPart ),
|
||||
m_sprOverPart( cpy.m_sprOverPart ),
|
||||
m_text( cpy.m_text ),
|
||||
m_Desc( cpy.m_Desc )
|
||||
{
|
||||
@@ -63,6 +64,7 @@ RoomWheelItem::RoomWheelItem( const RoomWheelItem &cpy ):
|
||||
{
|
||||
this->AddChild( m_sprNormalPart );
|
||||
this->AddChild( m_sprColorPart );
|
||||
this->AddChild( m_sprOverPart );
|
||||
this->AddChild( &m_text );
|
||||
this->AddChild( &m_Desc );
|
||||
}
|
||||
@@ -106,6 +108,9 @@ void RoomWheelItem::Load( RString sType )
|
||||
m_Desc.SetXY( DESC_X, DESC_Y);
|
||||
m_Desc.PlayCommand( "On" );
|
||||
this->AddChild( &m_Desc );
|
||||
|
||||
m_sprOverPart.Load( THEME->GetPathG(sType,"OverPart") );
|
||||
this->AddChild( m_sprOverPart );
|
||||
}
|
||||
|
||||
void RoomWheel::BuildWheelItemsData( vector<WheelItemBaseData*> &arrayWheelItemDatas )
|
||||
|
||||
@@ -30,6 +30,7 @@ public:
|
||||
private:
|
||||
AutoActor m_sprNormalPart;
|
||||
AutoActor m_sprColorPart;
|
||||
AutoActor m_sprOverPart;
|
||||
BitmapText m_text;
|
||||
BitmapText m_Desc;
|
||||
};
|
||||
|
||||
@@ -65,7 +65,7 @@ void ScreenNetSelectMusic::Init()
|
||||
m_DC[p] = GAMESTATE->m_PreferredDifficulty[p];
|
||||
|
||||
m_StepsDisplays[p].SetName( ssprintf("StepsDisplayP%d",p+1) );
|
||||
m_StepsDisplays[p].Load( "StepsDisplay", NULL );
|
||||
m_StepsDisplays[p].Load( "StepsDisplayNet", NULL );
|
||||
LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_StepsDisplays[p] );
|
||||
this->AddChild( &m_StepsDisplays[p] );
|
||||
}
|
||||
|
||||
@@ -25,6 +25,8 @@ void ScreenOptionsExportPackage::Init()
|
||||
void ScreenOptionsExportPackage::BeginScreen()
|
||||
{
|
||||
// Fill m_vsPossibleDirsToExport
|
||||
// todo: split these out over multiple screens so the scroller
|
||||
// isn't so overloaded. -freem
|
||||
{
|
||||
// Add themes
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user