http://ftp.x.org/contrib/applications/xscreensaver-3.07.tar.gz

[xscreensaver] / hacks / ant.c

diff --git a/hacks/ant.c b/hacks/ant.c
index 91be6445c49ea75c555b606dbf13fb4d368e0d7e..db76bfd3cead828c6ab22d9d7abaf6d6a87acfc1 100644 (file)
--- 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.
@@ -141,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;