From 7e1df89ffc0c4bba4bb0a4c8b6b52edb887c5ae2 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 16 Feb 2007 03:37:49 +0000
Subject: [PATCH] simplify

---
 .../BGAnimations/ScreenSystemLayer overlay.lua     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua
index c49f1a3084..49e0efda0c 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
@@ -19,20 +19,24 @@ local t = Def.ActorFrame {
 		Def.BitmapText {
 			Font=THEME:GetPathF(Var "LoadingScreen","message");
 			Text="";
-			InitCommand=cmd(visible,false);
-OnCommand=cmd(maxwidth,750;finishtweening;horizalign,left;vertalign,top;x,SCREEN_LEFT+20;y,SCREEN_TOP+20;zoom,0.8;shadowlength,2;diffusealpha,1;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH);
-OffCommand=cmd(sleep,5;linear,0.5;diffusealpha,0);
+			InitCommand=cmd(maxwidth,750;
+			horizalign,left;vertalign,top;
+			zoom,0.8;shadowlength,2;
+			y,SCREEN_TOP+20;
+			diffusealpha,0
+			);
 
 			SystemMessageMessageCommand = function(self, params)
-				self:visible(true);
 				self:settext( params.Message );
+				local f = cmd(finishtweening;x,SCREEN_LEFT+20;diffusealpha,1;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH); f(self);
 				self:playcommand( "On" );
 				if params.NoAnimate then
 					self:finishtweening();
 				end
+				f = cmd(sleep,5;linear,0.5;diffusealpha,0); f(self);
 				self:playcommand( "Off" );
 			end;
-			HideSystemMessageMessageCommand = cmd(visible,false);
+			HideSystemMessageMessageCommand = cmd(finishtweening);
 		};
 		CreditsText( PLAYER_1 ) .. {
 			InitCommand=cmd(x,SCREEN_LEFT+120;y,SCREEN_BOTTOM-6);