move style icon into Lua

stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua

@@ -0,0 +1,10 @@
+if not THEME:GetMetric(Var "LoadingScreen", "StyleIcon") then
+	return Def.Actor {};
+end
+
+local t = LoadActor( THEME:GetPathG(Var "LoadingScreen", "StyleIcon") )() .. {
+	BeginCommand = cmd(x,SCREEN_CENTER_X+817;y,SCREEN_TOP+26);
+	OnCommand = cmd(draworder,97;spring,0.5;addx,-SCREEN_WIDTH);
+	OffCommand = cmd(bouncebegin,0.5;addx,SCREEN_WIDTH);
+};
+return t;

stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua

@@ -0,0 +1,11 @@
+local style = GAMESTATE:GetCurrentStyle();
+if not style then return Def.Actor {}; end
+
+local s = style:GetName();
+local Reverse = PlayerNumber:Reverse();
+
+local t = LoadActor("_icon " .. s)() ..  {
+	InitCommand = cmd(pause;setstate,Reverse[GAMESTATE:GetMasterPlayerNumber()]);
+};
+
+return t;

stepmania/Themes/default/metrics.ini

@@ -2169,10 +2169,6 @@ HelpX=SCREEN_CENTER_X
 HelpY=SCREEN_BOTTOM-24
 HelpOnCommand=draworder,97;zoom,0.5;zoomy,0;linear,0.5;zoomy,0.5
 HelpOffCommand=linear,0.5;zoomy,0
-StyleIconX=SCREEN_CENTER_X+817
-StyleIconY=SCREEN_TOP+26
-StyleIconOnCommand=draworder,97;spring,0.5;addx,-SCREEN_WIDTH
-StyleIconOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH;
 MemoryCardDisplayP1X=SCREEN_LEFT+10;
 MemoryCardDisplayP1Y=SCREEN_CENTER_Y+220
 MemoryCardDisplayP1OnCommand=draworder,97;

stepmania/src/ScreenWithMenuElements.cpp

@@ -13,7 +13,6 @@
 #include "InputEventPlus.h"
 
 #define TIMER_STEALTH				THEME->GetMetricB(m_sName,"TimerStealth")
-#define STYLE_ICON				THEME->GetMetricB(m_sName,"StyleIcon")
 #define SHOW_STAGE				THEME->GetMetricB(m_sName,"ShowStage")
 #define MEMORY_CARD_ICONS			THEME->GetMetricB(m_sName,"MemoryCardIcons")
 #define FORCE_TIMER				THEME->GetMetricB(m_sName,"ForceTimer")
@@ -47,16 +46,6 @@ void ScreenWithMenuElements::Init()
 	SET_XY( m_autoHeader );
 	this->AddChild( m_autoHeader );
 
-	if( STYLE_ICON && GAMESTATE->GetCurrentStyle() )
-	{
-		m_sprStyleIcon.SetName( "StyleIcon" );
-		m_sprStyleIcon.Load( THEME->GetPathG("MenuElements",RString("icon ")+GAMESTATE->GetCurrentStyle()->m_szName) );
-		m_sprStyleIcon.StopAnimating();
-		m_sprStyleIcon.SetState( GAMESTATE->m_MasterPlayerNumber );
-		SET_XY( m_sprStyleIcon );
-		this->AddChild( &m_sprStyleIcon );
-	}
-	
 	if( SHOW_STAGE )
 	{
 		m_sprStage.Load( THEME->GetPathG(m_sName,"stage") );
@@ -176,9 +165,6 @@ void ScreenWithMenuElements::TweenOnScreen()
 {
 	ON_COMMAND( m_autoHeader );
 
-	if( STYLE_ICON && !m_sprStyleIcon.GetName().empty() )
-		ON_COMMAND( m_sprStyleIcon );
-
 	if( SHOW_STAGE && !m_sprStage->GetName().empty() )
 		ON_COMMAND( m_sprStage );
 
@@ -284,7 +270,6 @@ void ScreenWithMenuElements::TweenOffScreen()
 	}
 
 	OFF_COMMAND( m_autoHeader );
-	OFF_COMMAND( m_sprStyleIcon );
 	OFF_COMMAND( m_sprStage );
 	FOREACH_PlayerNumber( p )
 		if( m_MemoryCardDisplay[p] )

stepmania/src/ScreenWithMenuElements.h

@@ -2,10 +2,8 @@
 #define ScreenWithMenuElements_H
 
 #include "Screen.h"
-#include "Sprite.h"
 #include "Transition.h"
 #include "ActorUtil.h"
-//#include "RageSound.h"
 #include "ThemeMetric.h"
 
 class MenuTimer;
@@ -49,7 +47,6 @@ protected:
 
 	AutoActor			m_sprUnderlay;
 	AutoActor			m_autoHeader;
-	Sprite				m_sprStyleIcon;
 	AutoActor			m_sprStage;
 	MemoryCardDisplay		*m_MemoryCardDisplay[NUM_PLAYERS];
 	MenuTimer			*m_MenuTimer;