From 45ee492808a4f8f8f472cfd22dbbe0d5ea3d6b8f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 15 Dec 2006 23:04:47 +0000 Subject: [PATCH] LoadActor(path)(args) -> LoadActor(path, args) --- .../BGAnimations/ScreenCompany background/default.lua | 6 +++--- .../BGAnimations/ScreenEvaluationStage overlay/default.lua | 4 ++-- .../ScreenEvaluationStage overlay/life graph.lua | 2 +- .../BGAnimations/ScreenMusicScroll background/default.lua | 2 +- .../BGAnimations/ScreenNameEntry background/default.lua | 2 +- .../BGAnimations/ScreenRanking background/default.lua | 2 +- .../BGAnimations/ScreenWithMenuElements underlay.lua | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stepmania/Themes/default/BGAnimations/ScreenCompany background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenCompany background/default.lua index 610e609493..bc55efd51b 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCompany background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCompany background/default.lua @@ -1,13 +1,13 @@ local t = Def.ActorFrame { children = { - LoadActor("white.png")() .. { + LoadActor("white.png") .. { OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) }, - LoadActor("shadow (32bpp).png")() .. { + LoadActor("shadow (32bpp).png") .. { OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,0,0,0,1;addx,20;addy,6;linear,8;addx,-40) }, - LoadActor("stepmania (dither).png")() .. { + LoadActor("stepmania (dither).png") .. { File="stepmania (dither).png", OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y), } diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua index 877a74226f..99093d54b5 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/default.lua @@ -8,10 +8,10 @@ p2y = p2y + 75 Trace( "(x,y) = (" .. p1x .. "," .. p1y .. ")" ) return Def.ActorFrame { children = { - LoadActor("life graph")(PLAYER_1) .. { + LoadActor("life graph", PLAYER_1) .. { InitCommand = cmd(x,p1x;y,p1y), }, - LoadActor("life graph")(PLAYER_2) .. { + 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 d26b97aee2..c32e3e523a 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph.lua @@ -8,7 +8,7 @@ children = { local Stats = STATSMAN:GetCurStageStats(); self:LoadFromStats( Stats, Stats:GetPlayerStageStats(Player) ) end, - Texture = LoadActor("LifeGraph p1")() .. { + Texture = LoadActor("LifeGraph p1") .. { InitCommand=cmd(ztest,1;diffusealpha,0), OnCommand=cmd(linear,0.5;diffusealpha,1), OffCommand=cmd(linear,0.5;diffusealpha,0), diff --git a/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua index bf5493dd60..3a77459e5a 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenMusicScroll background/default.lua @@ -1,3 +1,3 @@ -return LoadActor( "_music scroll background" )() .. { +return LoadActor( "_music scroll background" ) .. { InitCommand = cmd(stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM), } diff --git a/stepmania/Themes/default/BGAnimations/ScreenNameEntry background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenNameEntry background/default.lua index 217b71b098..1151a6ae2b 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenNameEntry background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenNameEntry background/default.lua @@ -1,3 +1,3 @@ -return LoadActor( "_name entry" )() .. { +return LoadActor( "_name entry" ) .. { InitCommand = cmd(stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM), } diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua index f2cf101479..e24d7d2997 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenRanking background/default.lua @@ -1,3 +1,3 @@ -return LoadActor( "ranking" )() .. { +return LoadActor( "ranking" ) .. { InitCommand = cmd(stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) } diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua index 397be9be9b..365c8f264b 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua @@ -2,7 +2,7 @@ if not THEME:GetMetric(Var "LoadingScreen", "StyleIcon") then return Def.Actor {}; end -local t = LoadActor( THEME:GetPathG(Var "LoadingScreen", "StyleIcon") )() .. { +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);