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.
This commit is contained in:
@@ -124,24 +124,6 @@ void ScreenSelectMusic::Init()
|
|||||||
|
|
||||||
m_MusicWheel.Load( MUSIC_WHEEL_TYPE );
|
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.Load( THEME->GetPathG(m_sName,"wheel under") );
|
||||||
m_MusicWheelUnder->SetName( "WheelUnder" );
|
m_MusicWheelUnder->SetName( "WheelUnder" );
|
||||||
SET_XY( m_MusicWheelUnder );
|
SET_XY( m_MusicWheelUnder );
|
||||||
@@ -513,7 +495,6 @@ void ScreenSelectMusic::TweenOnScreen()
|
|||||||
|
|
||||||
FOREACH_HumanPlayer( p )
|
FOREACH_HumanPlayer( p )
|
||||||
{
|
{
|
||||||
ON_COMMAND( m_sprCharacterIcon[p] );
|
|
||||||
ON_COMMAND( m_OptionIconRow[p] );
|
ON_COMMAND( m_OptionIconRow[p] );
|
||||||
ON_COMMAND( m_sprHighScoreFrame[p] );
|
ON_COMMAND( m_sprHighScoreFrame[p] );
|
||||||
ON_COMMAND( m_textHighScore[p] );
|
ON_COMMAND( m_textHighScore[p] );
|
||||||
@@ -566,7 +547,6 @@ void ScreenSelectMusic::TweenOffScreen()
|
|||||||
|
|
||||||
FOREACH_HumanPlayer( p )
|
FOREACH_HumanPlayer( p )
|
||||||
{
|
{
|
||||||
OFF_COMMAND(m_sprCharacterIcon[p]);
|
|
||||||
OFF_COMMAND( m_OptionIconRow[p] );
|
OFF_COMMAND( m_OptionIconRow[p] );
|
||||||
OFF_COMMAND( m_sprHighScoreFrame[p] );
|
OFF_COMMAND( m_sprHighScoreFrame[p] );
|
||||||
OFF_COMMAND( m_textHighScore[p] );
|
OFF_COMMAND( m_textHighScore[p] );
|
||||||
|
|||||||
@@ -20,7 +20,6 @@
|
|||||||
#include "CourseContentsList.h"
|
#include "CourseContentsList.h"
|
||||||
#include "HelpDisplay.h"
|
#include "HelpDisplay.h"
|
||||||
#include "PaneDisplay.h"
|
#include "PaneDisplay.h"
|
||||||
#include "Character.h"
|
|
||||||
#include "RageUtil_BackgroundLoader.h"
|
#include "RageUtil_BackgroundLoader.h"
|
||||||
#include "ThemeMetric.h"
|
#include "ThemeMetric.h"
|
||||||
#include "ActorCommands.h"
|
#include "ActorCommands.h"
|
||||||
@@ -97,7 +96,6 @@ protected:
|
|||||||
CString m_sCourseMusicPath;
|
CString m_sCourseMusicPath;
|
||||||
CString m_sFallbackCDTitlePath;
|
CString m_sFallbackCDTitlePath;
|
||||||
|
|
||||||
Sprite m_sprCharacterIcon[NUM_PLAYERS];
|
|
||||||
Sprite m_sprBannerMask;
|
Sprite m_sprBannerMask;
|
||||||
FadingBanner m_Banner;
|
FadingBanner m_Banner;
|
||||||
AutoActor m_sprBannerFrame;
|
AutoActor m_sprBannerFrame;
|
||||||
|
|||||||
Reference in New Issue
Block a user