From fe718e19dadfca54bd7f814b383190f316f0e254 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 20 May 2007 18:13:10 +0000 Subject: [PATCH] simplify --- .../default/BGAnimations/ScreenCredits overlay/credits.lua | 2 +- .../Themes/default/BGAnimations/ScreenMusicScroll overlay.lua | 2 +- stepmania/Themes/default/BGAnimations/_frame 3x1/default.lua | 2 +- stepmania/Themes/default/BGAnimations/_frame 3x3/default.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua b/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua index fa9dd51e1e..e1a608e4bd 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua @@ -135,7 +135,7 @@ local function AddLine( text, command ) OnCommand = command or lineOn; } -- XXX: Hack. Wrap in an ActorFrame so OnCommand works - table.insert( t, WrapInActorFrame({t}) ) + table.insert( t, Def.ActorFrame { t } ) end -- Add header and padding diff --git a/stepmania/Themes/default/BGAnimations/ScreenMusicScroll overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenMusicScroll overlay.lua index a4a9460414..12097bc69e 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenMusicScroll overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenMusicScroll overlay.lua @@ -21,7 +21,7 @@ for i=1,num do OnCommand = cmd(zoom,0.7;diffuse,color); } - table.insert( t, WrapInActorFrame({text}) ) + table.insert( t, Def.ActorFrame { text } ) end return t; diff --git a/stepmania/Themes/default/BGAnimations/_frame 3x1/default.lua b/stepmania/Themes/default/BGAnimations/_frame 3x1/default.lua index 85a71d6b86..9673efba02 100644 --- a/stepmania/Themes/default/BGAnimations/_frame 3x1/default.lua +++ b/stepmania/Themes/default/BGAnimations/_frame 3x1/default.lua @@ -5,7 +5,7 @@ assert( Width ); local FullFile = THEME:GetPathB('','_frame files 3x1/'..File ) local Frame = LoadActor( FullFile ) -return WrapInActorFrame { +return Def.ActorFrame { Frame .. { InitCommand=cmd(setstate,0;pause;horizalign,right;x,-Width/2) }; Frame .. { InitCommand=cmd(setstate,1;pause;zoomtowidth,Width) }; Frame .. { InitCommand=cmd(setstate,2;pause;horizalign,left;x,Width/2) }; diff --git a/stepmania/Themes/default/BGAnimations/_frame 3x3/default.lua b/stepmania/Themes/default/BGAnimations/_frame 3x3/default.lua index a3a28fc56f..be645fc354 100644 --- a/stepmania/Themes/default/BGAnimations/_frame 3x3/default.lua +++ b/stepmania/Themes/default/BGAnimations/_frame 3x3/default.lua @@ -5,7 +5,7 @@ assert( Height ); local FullFile = THEME:GetPathB('','_frame files 3x3/'..File ) local Frame = LoadActor( FullFile ) -return WrapInActorFrame { +return Def.ActorFrame { Frame .. { InitCommand=cmd(setstate,0;pause;horizalign,right;vertalign,bottom;x,-Width/2;y,-Height/2) }; Frame .. { InitCommand=cmd(setstate,1;pause;zoomtowidth,Width;vertalign,bottom;zoomtowidth,Width;y,-Height/2) }; Frame .. { InitCommand=cmd(setstate,2;pause;horizalign,left;vertalign,bottom;x,Width/2;y,-Height/2) };