From 5278abc4bebadb5a9ab3dde11fe9dea40f5917a0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 6 Jul 2005 23:47:05 +0000 Subject: [PATCH] this can be done with Lua, by putting layers in the underlay. themes using this havn't been maintained or usable in a long time, and there doesn't seem to be interest in doing so, so I'm not implementing it in them; ask me if you want info--but there are too many special-case elements in this screen and it's unmanagable. --- stepmania/src/ScreenSelectMusic.cpp | 20 -------------------- stepmania/src/ScreenSelectMusic.h | 2 -- 2 files changed, 22 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index f2b661c29d..8e081ead15 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -124,24 +124,6 @@ void ScreenSelectMusic::Init() m_MusicWheel.Load( MUSIC_WHEEL_TYPE ); - // pop'n music has this under the songwheel... - FOREACH_PlayerNumber( p ) - { - m_sprCharacterIcon[p].SetName( ssprintf("CharacterIconP%d",p+1) ); - - Character* pChar = GAMESTATE->m_pCurCharacters[p]; - CString sPath = pChar->GetSongSelectIconPath(); - - if( sPath.empty() ) - continue; - - m_sprCharacterIcon[p].Load( sPath ); - SET_XY( m_sprCharacterIcon[p] ); - this->AddChild( &m_sprCharacterIcon[p] ); - } - - - m_MusicWheelUnder.Load( THEME->GetPathG(m_sName,"wheel under") ); m_MusicWheelUnder->SetName( "WheelUnder" ); SET_XY( m_MusicWheelUnder ); @@ -513,7 +495,6 @@ void ScreenSelectMusic::TweenOnScreen() FOREACH_HumanPlayer( p ) { - ON_COMMAND( m_sprCharacterIcon[p] ); ON_COMMAND( m_OptionIconRow[p] ); ON_COMMAND( m_sprHighScoreFrame[p] ); ON_COMMAND( m_textHighScore[p] ); @@ -566,7 +547,6 @@ void ScreenSelectMusic::TweenOffScreen() FOREACH_HumanPlayer( p ) { - OFF_COMMAND(m_sprCharacterIcon[p]); OFF_COMMAND( m_OptionIconRow[p] ); OFF_COMMAND( m_sprHighScoreFrame[p] ); OFF_COMMAND( m_textHighScore[p] ); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index ea818d5ca5..c1e7647fda 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -20,7 +20,6 @@ #include "CourseContentsList.h" #include "HelpDisplay.h" #include "PaneDisplay.h" -#include "Character.h" #include "RageUtil_BackgroundLoader.h" #include "ThemeMetric.h" #include "ActorCommands.h" @@ -97,7 +96,6 @@ protected: CString m_sCourseMusicPath; CString m_sFallbackCDTitlePath; - Sprite m_sprCharacterIcon[NUM_PLAYERS]; Sprite m_sprBannerMask; FadingBanner m_Banner; AutoActor m_sprBannerFrame;