From ab90117c3d061fedaade171e2ceed0beed30f2bc Mon Sep 17 00:00:00 2001
From: zueuk <zueuk>
Date: Sun, 14 Nov 2010 10:54:23 +0000
Subject: [PATCH] variables renamed

---
 2.10/Source/ScriptForm.pas |  8 ++++++--
 2.10/Source/XForm.pas      | 11 +++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/2.10/Source/ScriptForm.pas b/2.10/Source/ScriptForm.pas
index 8ebe51a..6b49c9d 100644
--- a/2.10/Source/ScriptForm.pas
+++ b/2.10/Source/ScriptForm.pas
@@ -25,7 +25,11 @@ uses
   ExtCtrls, StdCtrls, ControlPoint, Buttons, ComCtrls, ToolWin, Menus,
   atScript, atPascal, AdvMemo, Advmps, XFormMan, XForm, GradientHlpr, cmap;
 
-const NCPS = 10;
+const
+  NCPS = 10;
+
+  scriptFavsFilename = 'favorites';
+
 type
   TOptions = class
   public
@@ -3735,7 +3739,7 @@ begin
       There := true;
   if there then exit;
   Favorites.Add(Script);
-  Favorites.SaveToFile(AppPath + 'favorites');
+  Favorites.SaveToFile(AppPath + scriptFavsFilename);
 end;
 
 procedure TScriptEditor.FormShortCut(var Msg: TWMKey; var Handled: Boolean);
diff --git a/2.10/Source/XForm.pas b/2.10/Source/XForm.pas
index 7473fcb..22004aa 100644
--- a/2.10/Source/XForm.pas
+++ b/2.10/Source/XForm.pas
@@ -2154,7 +2154,9 @@ var
 begin
   result := Format('   <xform weight="%g" color="%g" ', [weight, color]);
   if color_speed <> 0 then
-    result := result + format('symmetry="%g" ', [color_speed]);
+    result := result + format('color_speed="%g" ', [color_speed]);
+  if animate <> 0 then
+    result := result + format('animate="%g" ', [color_speed]);
   if opacity <> 1 then
     Result := Result + Format('opacity="%g" ', [opacity]);
 
@@ -2200,9 +2202,10 @@ var
 begin
 //  result := Format('   <finalxform enabled="%d" color="%g" symmetry="%g" ',
 //                   [ifthen(IsEnabled, 1, 0), color, symmetry]);
-  result := Format('   <finalxform color="%g" ', [color]);
-  if color_speed <> 0 then result := result + format('symmetry="%g" ', [color_speed]);
-  for i := 0 to nrvar - 1 do begin
+  Result := '   <finalxform ';
+  if color_speed <> 1 then
+    Result := Result + format('color="%g" color_speed="%g" ', [color, color_speed]);
+  for i := 0 to NrVar - 1 do begin
     if vars[i] <> 0 then
       Result := Result + varnames(i) + format('="%g" ', [vars[i]]);
   end;