From 0f8e62ee3a8e116ad274ca41365549624a69aeab Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <wayo.cavazos@gmail.com>
Date: Mon, 8 Oct 2007 14:52:54 -0500
Subject: [PATCH] Get some cfdg models to compile

---
 extra/cfdg/models/aqua-star/aqua-star.factor    | 13 +++++++------
 .../cfdg/models/game1-turn6/game1-turn6.factor  | 17 ++++++++---------
 extra/cfdg/models/snowflake/snowflake.factor    |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/extra/cfdg/models/aqua-star/aqua-star.factor b/extra/cfdg/models/aqua-star/aqua-star.factor
index ee42b9a370..062f10b292 100644
--- a/extra/cfdg/models/aqua-star/aqua-star.factor
+++ b/extra/cfdg/models/aqua-star/aqua-star.factor
@@ -6,12 +6,13 @@ IN: cfdg.models.aqua-star
 
 : tentacle ( -- )
 iterate? [
-  { [ circle
-      [ .23 y .99 s .002 b tentacle ] do ]
-    [ circle
-      [ .17 y 2 r .99 s .002 b tentacle ] do ]
-    [ circle
-      [ .12 y -2 r .99 s .001 b tentacle ] do ] } random call
+  { { 1 [ circle
+          [ .23 y .99 s .002 b tentacle ] do ] }
+    { 1 [ circle
+      	  [ .17 y 2 r .99 s .002 b tentacle ] do ] }
+    { 1 [ circle
+      	  [ .12 y -2 r .99 s .001 b tentacle ] do ] } }
+  call-random-weighted
 ] when ;
 
 : anemone ( -- )
diff --git a/extra/cfdg/models/game1-turn6/game1-turn6.factor b/extra/cfdg/models/game1-turn6/game1-turn6.factor
index 6289c35985..c00f95233c 100644
--- a/extra/cfdg/models/game1-turn6/game1-turn6.factor
+++ b/extra/cfdg/models/game1-turn6/game1-turn6.factor
@@ -1,5 +1,4 @@
 
-
 USING: kernel namespaces math opengl.gl opengl.glu ui ui.gadgets.slate
        mortar random-weighted cfdg ;
 
@@ -24,17 +23,17 @@ IN: cfdg.models.game1-turn6
 DEFER: start
 
 : spiral ( -- ) iterate? [
-{ { 1 [ f-squares
-      	[ 0.5 x 0.5 y 45 r f-triangles ] do
-	[ 1 y 25 r 0.9 s spiral ] do ] }
-  { 0.022 [ [ 90 flip 50 hue start ] do ] } }
-random-weighted* call
+  { { 1 [ f-squares
+      	  [ 0.5 x 0.5 y 45 r f-triangles ] do
+	  [ 1 y 25 r 0.9 s spiral ] do ] }
+    { 0.022 [ [ 90 flip 50 hue start ] do ] } }
+  call-random-weighted
 ] when ;
 
 : start ( -- )
-[       spiral ] do
-[ 120 r spiral ] do
-[ 240 r spiral ] do ;
+  [       spiral ] do
+  [ 120 r spiral ] do
+  [ 240 r spiral ] do ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
diff --git a/extra/cfdg/models/snowflake/snowflake.factor b/extra/cfdg/models/snowflake/snowflake.factor
index e42c297581..eb1936101a 100644
--- a/extra/cfdg/models/snowflake/snowflake.factor
+++ b/extra/cfdg/models/snowflake/snowflake.factor
@@ -11,8 +11,8 @@ iterate? [
     { 0.03 [ square
       	     [ 60 r spike ] do
 	     [ -60 r spike ] do
-	     [ 0.95 y 0.97 s spike ] do ] }
-  } random-weighted* call
+	     [ 0.95 y 0.97 s spike ] do ] } }
+  call-random-weighted
 ] when ;
 
 : snowflake ( -- )