eval cleanup

2008-04-04 20:10:10 +00:00
parent d4ebcc512a
commit 089e44e6e7
6 changed files with 17 additions and 8 deletions
@@ -13,4 +13,10 @@ t[#t+1] = LoadActor("life graph", PLAYER_1) .. {
 t[#t+1] = LoadActor("life graph", PLAYER_2) .. {
 	InitCommand = cmd(x,p2x;y,p2y);
 };
+
+t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "TimingDifficultyFrame", "TimingDifficultyFrame" );
+t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficulty" ) .. {
+	InitCommand=function(self) self:name("TimingDifficulty"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
+};
+
 return t;
@@ -2,14 +2,7 @@ local MetricsName, FileName = ...;
 local t = LoadActor( THEME:GetPathG(Var "LoadingScreen",FileName) );
 if type(t) == "table" then
 	t = t .. {
-		InitCommand=function(self)
-				local x1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "X");
-				if x1 then self:x(x1); end
-				local y1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "Y");
-				if y1 then self:y(y1); end
-			end;
-		OnCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OnCommand");
-		OffCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OffCommand");
+		InitCommand=function(self) self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
 	};
 end
 return t;
@@ -0,0 +1 @@
+common normal
@@ -1388,6 +1388,15 @@ SurvivedNumberP2Y=SCREEN_CENTER_Y+0
 SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
 SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0

+TimingDifficultyX=SCREEN_CENTER_X+120
+TimingDifficultyY=SCREEN_CENTER_Y-200
+TimingDifficultyOnCommand=draworder,2
+TimingDifficultyOffCommand=
+TimingDifficultyFrameX=SCREEN_CENTER_X+120
+TimingDifficultyFrameY=SCREEN_CENTER_Y-200
+TimingDifficultyFrameOnCommand=draworder,2
+TimingDifficultyFrameOffCommand=
+
 CheerDelaySeconds=2.5

 [ScreenNetEvaluation]