From f31e2edcc274cd9bcb5aa208a42ad8c9b05b644d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 20 May 2007 17:59:03 +0000 Subject: [PATCH] reomve old "children" node --- .../Themes/default/Graphics/Player combo/default.lua | 7 +++---- .../Themes/default/Graphics/Player judgment/default.lua | 5 +++-- .../Themes/default/Graphics/ScreenTitleMenu scroll.lua | 4 ++-- stepmania/Themes/default/Graphics/_PaneDisplay label.lua | 9 +++------ 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/stepmania/Themes/default/Graphics/Player combo/default.lua b/stepmania/Themes/default/Graphics/Player combo/default.lua index 249051ab3c..ab2fdb7a37 100644 --- a/stepmania/Themes/default/Graphics/Player combo/default.lua +++ b/stepmania/Themes/default/Graphics/Player combo/default.lua @@ -7,7 +7,7 @@ local NumberMinZoom = THEME:GetMetric("Combo", "NumberMinZoom"); local NumberMaxZoom = THEME:GetMetric("Combo", "NumberMaxZoom"); local NumberMaxZoomAt = THEME:GetMetric("Combo", "NumberMaxZoomAt"); -local t = { +local t = Def.ActorFrame { LoadFont( "Combo", "numbers" ) .. { Name="Number"; OnCommand = THEME:GetMetric("Combo", "NumberOnCommand"); @@ -20,10 +20,7 @@ local t = { Name="MissesLabel"; OnCommand = THEME:GetMetric("Combo", "LabelOnCommand"); }; -}; -return Def.ActorFrame { - children = t; InitCommand = function(self) c = self:GetChildren(); c.Number:visible(false); @@ -59,3 +56,5 @@ return Def.ActorFrame { Pulse( Label, param ); end; }; + +return t; diff --git a/stepmania/Themes/default/Graphics/Player judgment/default.lua b/stepmania/Themes/default/Graphics/Player judgment/default.lua index 900da8dd61..114764f118 100644 --- a/stepmania/Themes/default/Graphics/Player judgment/default.lua +++ b/stepmania/Themes/default/Graphics/Player judgment/default.lua @@ -27,8 +27,7 @@ local TNSFrames = { TapNoteScore_Miss = 5; }; -return Def.ActorFrame { - children = t; +local t = Def.ActorFrame { InitCommand = function(self) c = self:GetChildren(); end; @@ -53,3 +52,5 @@ return Def.ActorFrame { JudgeCmds[param.TapNoteScore](c.Judgment); end; }; + +return t; diff --git a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua index 8f8f6cccb1..1410d07bf6 100644 --- a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua +++ b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua @@ -1,4 +1,4 @@ -local children = { +local t = Def.ActorFrame { LoadFont("", "blaster") ..{ Text=THEME:GetString( 'ScreenTitleMenu', ThisGameCommand:GetText() ); InitCommand=cmd(horizalign,center;shadowlength,0); @@ -8,4 +8,4 @@ local children = { }; }; -return Def.ActorFrame { children = children }; \ No newline at end of file +return t; diff --git a/stepmania/Themes/default/Graphics/_PaneDisplay label.lua b/stepmania/Themes/default/Graphics/_PaneDisplay label.lua index 78ff93a48d..f262222ab7 100644 --- a/stepmania/Themes/default/Graphics/_PaneDisplay label.lua +++ b/stepmania/Themes/default/Graphics/_PaneDisplay label.lua @@ -5,11 +5,8 @@ return Def.ActorFrame { OffFocusedCommand=cmd(); OffUnfocusedCommand=cmd(); - children = - { - LoadFont( "Common", "normal" ) .. { - Text=THEME:GetString("PaneDisplay", text); - OnCommand=cmd(shadowlength,0;horizalign,left;zoom,0.5); - }; + LoadFont( "Common", "normal" ) .. { + Text=THEME:GetString("PaneDisplay", text); + OnCommand=cmd(shadowlength,0;horizalign,left;zoom,0.5); }; };