From ac92794e43e721cbb1d95a5c86a7440b00263bd3 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 18 Dec 2010 03:53:17 -0600 Subject: [PATCH] [MusicWheel] add OverPart --- Docs/Changelog_sm-ssc.txt | 4 ++++ .../MusicWheelItem Course OverPart.redir | 1 + .../Graphics/MusicWheelItem Mode OverPart.redir | 1 + .../MusicWheelItem Portal OverPart.redir | 1 + .../MusicWheelItem Random OverPart.redir | 1 + .../MusicWheelItem Roulette OverPart.redir | 1 + ...usicWheelItem SectionCollapsed OverPart.redir | 1 + ...MusicWheelItem SectionExpanded OverPart.redir | 1 + .../Graphics/MusicWheelItem Song OverPart.redir | 1 + .../Graphics/MusicWheelItem Sort OverPart.redir | 1 + src/MusicWheelItem.cpp | 16 ++++++++++++++++ src/MusicWheelItem.h | 1 + 12 files changed, 30 insertions(+) create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Course OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Mode OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Portal OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Random OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Roulette OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem SectionCollapsed OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem SectionExpanded OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Song OverPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Sort OverPart.redir diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 029a05b989..d913d09145 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -13,6 +13,10 @@ _____________________________________________________________________________ sm-ssc v1.2 | 201012xx -------------------------------------------------------------------------------- +20101218 +-------- +* [MusicWheelItem] Add OverPart. [freem] + 20101217 -------- * [Sprite] Added SetAllStateDelays(fDelay) Lua binding. [freem] diff --git a/Themes/_fallback/Graphics/MusicWheelItem Course OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Course OverPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Course OverPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Mode OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Mode OverPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Mode OverPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Portal OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Portal OverPart.redir new file mode 100644 index 0000000000..c94ae9b2f3 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Portal OverPart.redir @@ -0,0 +1 @@ +MusicWheelItem Roulette NormalPart \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Random OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Random OverPart.redir new file mode 100644 index 0000000000..c94ae9b2f3 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Random OverPart.redir @@ -0,0 +1 @@ +MusicWheelItem Roulette NormalPart \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Roulette OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Roulette OverPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Roulette OverPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem SectionCollapsed OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem SectionCollapsed OverPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem SectionCollapsed OverPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem SectionExpanded OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem SectionExpanded OverPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem SectionExpanded OverPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Song OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Song OverPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Song OverPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Sort OverPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Sort OverPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Sort OverPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/src/MusicWheelItem.cpp b/src/MusicWheelItem.cpp index f307ef6080..209cc35f7f 100644 --- a/src/MusicWheelItem.cpp +++ b/src/MusicWheelItem.cpp @@ -66,6 +66,14 @@ MusicWheelItem::MusicWheelItem( RString sType ): m_TextBanner.PlayCommand( "On" ); this->AddChild( &m_TextBanner ); + FOREACH_ENUM( MusicWheelItemType, i ) + { + m_sprOverPart[i].Load( THEME->GetPathG(sType,MusicWheelItemTypeToString(i)+" OverPart") ); + m_sprOverPart[i]->SetName( MusicWheelItemTypeToString(i)+"OverPart" ); + ActorUtil::LoadAllCommands(m_sprOverPart[i],"MusicWheelItem"); + this->AddChild( m_sprOverPart[i] ); + } + FOREACH_ENUM( MusicWheelItemType, i ) { m_pText[i] = NULL; @@ -130,6 +138,12 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ): this->AddChild( &m_TextBanner ); + FOREACH_ENUM( MusicWheelItemType, i ) + { + m_sprOverPart[i] = cpy.m_sprOverPart[i]; + this->AddChild( m_sprOverPart[i] ); + } + FOREACH_ENUM( MusicWheelItemType, i ) { if( cpy.m_pText[i] == NULL ) @@ -170,6 +184,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pData, int { m_sprColorPart[i]->SetVisible( false ); m_sprNormalPart[i]->SetVisible( false ); + m_sprOverPart[i]->SetVisible( false ); } m_TextBanner.SetVisible( false ); FOREACH_ENUM( MusicWheelItemType, i ) @@ -246,6 +261,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pData, int m_sprColorPart[type]->SetVisible( true ); m_sprColorPart[type]->SetDiffuse( pWID->m_color ); m_sprNormalPart[type]->SetVisible( true ); + m_sprOverPart[type]->SetVisible( true ); BitmapText *bt = m_pText[type]; if( bt ) { diff --git a/src/MusicWheelItem.h b/src/MusicWheelItem.h index 246de3e0d6..28c07d301e 100644 --- a/src/MusicWheelItem.h +++ b/src/MusicWheelItem.h @@ -51,6 +51,7 @@ private: AutoActor m_sprColorPart[NUM_MusicWheelItemType]; AutoActor m_sprNormalPart[NUM_MusicWheelItemType]; + AutoActor m_sprOverPart[NUM_MusicWheelItemType]; TextBanner m_TextBanner; // used by Type_Song instead of m_pText BitmapText *m_pText[NUM_MusicWheelItemType];