From e94ae65746a588da91e3a989c30b4a332eb4e240 Mon Sep 17 00:00:00 2001
From: ronaldhordijk <ronaldhordijk>
Date: Thu, 23 Jun 2005 17:55:50 +0000
Subject: [PATCH] spiral batch bug fixed

---
 2.10/Source/ScriptForm.dfm | 2 +-
 2.10/Source/ScriptForm.pas | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/2.10/Source/ScriptForm.dfm b/2.10/Source/ScriptForm.dfm
index 84a0253..4b48a79 100644
--- a/2.10/Source/ScriptForm.dfm
+++ b/2.10/Source/ScriptForm.dfm
@@ -165,7 +165,7 @@ object ScriptEditor: TScriptEditor
         'end;')
       MarkerList.UseDefaultMarkerImageIndex = False
       MarkerList.DefaultMarkerImageIndex = -1
-      MarkerList.ImageTransparentColor = -1
+      MarkerList.ImageTransparentColor = 33554432
       PrintOptions.MarginLeft = 0
       PrintOptions.MarginRight = 0
       PrintOptions.MarginTop = 0
diff --git a/2.10/Source/ScriptForm.pas b/2.10/Source/ScriptForm.pas
index c595dfd..9cf4af9 100644
--- a/2.10/Source/ScriptForm.pas
+++ b/2.10/Source/ScriptForm.pas
@@ -1649,7 +1649,7 @@ begin
   with AMachine do
   begin
     i := integer(Variation);
-    if (i >= NRVAR) or (i < 0) then
+    if (i >= NRVISVAR) or (i < 0) then
       i := -1;
     ReturnOutputArg(i);
   end
@@ -1662,8 +1662,8 @@ begin
   with AMachine do
   begin
     i := GetInputArgAsInteger(0);
-    if (i < 0) or (i >= NRVAR) then
-      i := NRVAR;
+    if (i < 0) or (i >= NRVISVAR) then
+      i := NRVISVAR - 1;
     Variation := TVariation(i);
     if i = -1 then
       MainForm.mnuVRandom.checked := True