From cabcc5a5a2e5dfba5a7d1fa6a8f538cbea28e55b Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 23 Aug 2011 11:15:26 -0500 Subject: [PATCH] fix particles and re-enable them --- .../ScreenWithMenuElements background/_particleLoader.lua | 4 ++-- .../ScreenWithMenuElements background/default.lua | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/_particleLoader.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/_particleLoader.lua index 9e31f66838..65bfea4cad 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/_particleLoader.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/_particleLoader.lua @@ -24,8 +24,8 @@ local tParticleInfo = {} for i=1,Params.NumParticles do tParticleInfo[i] = { X = math.random(Params.VelocityXMin, Params.VelocityXMax), - Y = math.random(Params.VelocityYMin, Params.VelocityYMax), - Z = math.random(Params.VelocityZMin, Params.VelocityZMax), + Y = Params.VelocityYMin ~= Params.VelocityYMax and math.random(Params.VelocityYMin, Params.VelocityYMax) or Params.VelocityYMin, + Z = Params.VelocityZMin ~= Params.VelocityZMax and math.random(Params.VelocityZMin, Params.VelocityZMax) or Params.VelocityZMin, Zoom = math.random(Params.ZoomMin*1000,Params.ZoomMax*1000) / 1000, BobZRate = math.random(Params.BobRateZMin*1000,Params.BobRateZMax*1000) / 1000, Age = 0, diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index 1650f2e0e6..c370676bc3 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -13,11 +13,9 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,color("#ffd400");diffusealpha,0.045;bob;effectmagnitude,0,0,35;effectperiod,4); }; }; - --[[ LoadActor("_particleLoader") .. { InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y;hide_if,hideFancyElements;); }; - --]] --[[ LoadActor("_particles") .. { InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y); }; --]]