From 4a6ec0a155d33bb6e139ad3b7484d3982f2e6326 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 1 May 2005 23:38:40 +0000 Subject: [PATCH] separate bar graphics for sort and mode --- .../Graphics/MusicWheelItem mode.redir | 1 + .../Graphics/MusicWheelItem sort.redir | 1 + stepmania/src/MusicWheelItem.cpp | 20 ++++++++++++++++++- stepmania/src/MusicWheelItem.h | 2 ++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 stepmania/Themes/default/Graphics/MusicWheelItem mode.redir create mode 100644 stepmania/Themes/default/Graphics/MusicWheelItem sort.redir diff --git a/stepmania/Themes/default/Graphics/MusicWheelItem mode.redir b/stepmania/Themes/default/Graphics/MusicWheelItem mode.redir new file mode 100644 index 0000000000..fba071e1d3 --- /dev/null +++ b/stepmania/Themes/default/Graphics/MusicWheelItem mode.redir @@ -0,0 +1 @@ +MusicWheelItem section \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/MusicWheelItem sort.redir b/stepmania/Themes/default/Graphics/MusicWheelItem sort.redir new file mode 100644 index 0000000000..fba071e1d3 --- /dev/null +++ b/stepmania/Themes/default/Graphics/MusicWheelItem sort.redir @@ -0,0 +1 @@ +MusicWheelItem section \ No newline at end of file diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index 881c9eac92..e24d8afe83 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -61,6 +61,14 @@ MusicWheelItem::MusicWheelItem() m_sprExpandedBar.SetXY( 0, 0 ); this->AddChild( &m_sprExpandedBar ); + m_sprModeBar.Load( THEME->GetPathG("MusicWheelItem","mode") ); + m_sprModeBar.SetXY( 0, 0 ); + this->AddChild( &m_sprModeBar ); + + m_sprSortBar.Load( THEME->GetPathG("MusicWheelItem","sort") ); + m_sprSortBar.SetXY( 0, 0 ); + this->AddChild( &m_sprSortBar ); + m_fPercentGray = 0; m_WheelNotifyIcon.SetXY( ICON_X, ICON_Y ); m_WheelNotifyIcon.RunCommands( ICON_ON_COMMAND ); @@ -116,6 +124,8 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID, bool bExpanded m_sprSongBar.SetHidden( true ); m_sprSectionBar.SetHidden( true ); m_sprExpandedBar.SetHidden( true ); + m_sprModeBar.SetHidden( true ); + m_sprSortBar.SetHidden( true ); m_textSection.SetHidden( true ); m_textRoulette.SetHidden( true ); FOREACH_PlayerNumber( p ) @@ -194,8 +204,16 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID, bool bExpanded case TYPE_ROULETTE: case TYPE_RANDOM: case TYPE_PORTAL: + if( bExpanded ) + m_sprExpandedBar.SetHidden( false ); + else + m_sprSectionBar.SetHidden( false ); + break; case TYPE_SORT: - (bExpanded ? m_sprExpandedBar : m_sprSectionBar).SetHidden( false ); + if( pWID->m_Action.m_pm != PLAY_MODE_INVALID ) + m_sprModeBar.SetHidden( false ); + else + m_sprSortBar.SetHidden( false ); break; case TYPE_SONG: case TYPE_COURSE: diff --git a/stepmania/src/MusicWheelItem.h b/stepmania/src/MusicWheelItem.h index f856259a7d..d06e3e18e5 100644 --- a/stepmania/src/MusicWheelItem.h +++ b/stepmania/src/MusicWheelItem.h @@ -30,6 +30,8 @@ public: Sprite m_sprSongBar; Sprite m_sprSectionBar; Sprite m_sprExpandedBar; + Sprite m_sprModeBar; + Sprite m_sprSortBar; WheelNotifyIcon m_WheelNotifyIcon; TextBanner m_TextBanner; BitmapText m_textSection;