X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fant.c;h=db76bfd3cead828c6ab22d9d7abaf6d6a87acfc1;hb=a445bdd3e3ba4abbee441844b6665b4c3c13d48c;hp=2818fceca4fda5f20ed36bc0d77c0419dc9f5fbd;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver

diff --git a/hacks/ant.c b/hacks/ant.c
index 2818fcec..db76bfd3 100644
--- a/hacks/ant.c
+++ b/hacks/ant.c
@@ -68,9 +68,10 @@ static const char sccsid[] = "@(#)ant.c	4.11 98/06/18 xlockmore";
 # include "erase.h"
 #else /* STANDALONE */
 # include "xlock.h"		/* in xlockmore distribution */
-# include "automata.h"
 #endif /* STANDALONE */
 
+#include "automata.h"
+
 /*-
  * neighbors of 0 randomizes it between 3, 4 and 6.
  * 8, 9 12 are available also but not recommended.
@@ -84,6 +85,7 @@ extern int  neighbors;
 
 #define DEF_TRUCHET  "False"
 #define DEF_SHARPTURN  "False"
+#define DEF_NEIGHBORS  "0"
 
 static Bool truchet;
 static Bool sharpturn;
@@ -106,7 +108,7 @@ static argtype vars[] =
 	{(caddr_t *) & truchet, "truchet", "Truchet", DEF_TRUCHET, t_Bool},
    {(caddr_t *) & sharpturn, "sharpturn", "SharpTurn", DEF_SHARPTURN, t_Bool},
 #ifdef STANDALONE
-	{(caddr_t *) & neighbors, "neighbors", "Neighbors", 0, t_Int}
+	{(caddr_t *) & neighbors, "neighbors", "Neighbors", DEF_NEIGHBORS, t_Int}
 #endif /* STANDALONE */
 };
 static OptionStruct desc[] =
@@ -140,52 +142,6 @@ ModStruct   ant_description =
 #define MINRANDOMSIZE 5
 #define ANGLES 360
 
-#ifdef STANDALONE
-
-#define NUMSTIPPLES 11
-#define STIPPLESIZE 8
-
-static XPoint hexagonUnit[6] =
-{
-	{0, 0},
-	{1, 1},
-	{0, 2},
-	{-1, 1},
-	{-1, -1},
-	{0, -2}
-};
-
-static XPoint triangleUnit[2][3] =
-{
-	{
-		{0, 0},
-		{1, -1},
-		{0, 2}
-	},
-	{
-		{0, 0},
-		{-1, 1},
-		{0, -2}
-	}
-};
-
-
-static unsigned char stipples[NUMSTIPPLES][STIPPLESIZE] =
-{
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},	/* white */
-	{0x11, 0x22, 0x11, 0x22, 0x11, 0x22, 0x11, 0x22},	/* grey+white | stripe */
-	{0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00},	/* spots */
-	{0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11},	/* lt. / stripe */
-	{0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66},	/* | bars */
-	{0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa},	/* 50% grey */
-	{0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00},	/* - bars */
-	{0xee, 0xdd, 0xbb, 0x77, 0xee, 0xdd, 0xbb, 0x77},	/* dark \ stripe */
-	{0xff, 0x99, 0x99, 0xff, 0xff, 0x99, 0x99, 0xff},	/* spots */
-	{0xaa, 0xff, 0xff, 0x55, 0xaa, 0xff, 0xff, 0x55},	/* black+grey - stripe */
-	{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}	/* black */
-};
-
-#endif /* STANDALONE */
 
 typedef struct {
 	unsigned char color;