diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua index 3fd60ad2fd..8f6c2c5031 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua @@ -6,12 +6,10 @@ p1y = p1y + 75 -- It starts 75 pixels down from the top of the Bonus frame. p2y = p2y + 75 return Def.ActorFrame { - children = { - LoadActor("life graph", PLAYER_1) .. { - InitCommand = cmd(x,p1x;y,p1y), - }, - LoadActor("life graph", PLAYER_2) .. { - InitCommand = cmd(x,p2x;y,p2y), - }, - } + LoadActor("life graph", PLAYER_1) .. { + InitCommand = cmd(x,p1x;y,p1y); + }; + LoadActor("life graph", PLAYER_2) .. { + InitCommand = cmd(x,p2x;y,p2y); + }; } diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph.lua index c32e3e523a..e6280c68ed 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph.lua @@ -2,7 +2,6 @@ local Player = ... assert( Player ); local t = Def.ActorFrame { -children = { Def.GraphDisplay { OnCommand=function(self) local Stats = STATSMAN:GetCurStageStats(); @@ -19,5 +18,4 @@ children = { Barely = Def.Actor { InitCommand=cmd(hidden,1) }, } } -} return t diff --git a/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua index ecbde54e5e..86efbb77bb 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua @@ -1,4 +1,4 @@ -local children = { +local t = Def.ActorFrame { LoadActor( "_music scroll background" ) .. { InitCommand = cmd(scale_or_crop_background); }; @@ -7,4 +7,4 @@ local children = { InitCommand = cmd(align,0,1;x,SCREEN_LEFT+20;y,SCREEN_BOTTOM-40;zoom,.8) }; } -return WrapInActorFrame( children ) +return t; diff --git a/stepmania/Themes/default/BGAnimations/ScreenStage overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenStage overlay/default.lua index 8c2e4e0e85..049b444226 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenStage overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenStage overlay/default.lua @@ -1,4 +1,4 @@ -local children = { +local t = Def.ActorFrame { LoadSongBackground() .. { Condition=not GAMESTATE:IsCourseMode(); OnCommand=cmd(zoom,0;rotationz,0;linear,.5;diffusealpha,1;zoom,1;rotationz,1080); @@ -6,7 +6,7 @@ local children = { }; local OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+180;diffusealpha,0;linear,0.3;diffusealpha,0.75); local function AddChild( name ) - children[#children+1] = LoadActor( name .. ".png" ) .. { + t[#t+1] = LoadActor( name .. ".png" ) .. { OnCommand=OnCommand; Condition=GAMESTATE:GetCurrentStage() == "Stage_" .. name; }; @@ -21,4 +21,4 @@ AddChild( "Event" ); AddChild( "Nonstop" ); AddChild( "Oni" ); AddChild( "Endless" ); -return Def.ActorFrame { children=children }; +return t;