X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hacks%2Fant.c;h=d5070d24a0305a6445abd1857c891da376973ba6;hb=c6b273ef7292ba10943694df1656b05203d7b62f;hp=5ceb5fa7a4d0f53fd9a03c017e5433faab599540;hpb=5b7bc6e70fb439cf4c4bf771ae9f94077fe4fe08;p=xscreensaver diff --git a/hacks/ant.c b/hacks/ant.c index 5ceb5fa7..d5070d24 100644 --- a/hacks/ant.c +++ b/hacks/ant.c @@ -61,9 +61,7 @@ static const char sccsid[] = "@(#)ant.c 4.04 97/07/28 xlockmore"; "*count: -3 \n" \ "*cycles: 40000 \n" \ "*size: -7 \n" \ - "*ncolors: 64 \n" \ - "*eraseSpeed: 400 \n" \ - "*eraseMode: -1 \n" + "*ncolors: 64 \n" # include "xlockmore.h" /* in xscreensaver distribution */ # include "erase.h" #else /* STANDALONE */ @@ -71,7 +69,7 @@ static const char sccsid[] = "@(#)ant.c 4.04 97/07/28 xlockmore"; #endif /* STANDALONE */ -#define DEF_TRUCHET "False" +#define DEF_TRUCHET "True" #ifdef STANDALONE static int neighbors; @@ -121,7 +119,7 @@ ModeSpecOpt ant_opts = #define MINGRIDSIZE 24 #define MINSIZE 1 #define ANGLES 360 -#define NEIGHBORKINDS 3 +#define NEIGHBORKINDS 2 #ifdef STANDALONE static XPoint hexagonUnit[6] = @@ -201,7 +199,7 @@ typedef struct { } antfarmstruct; static int initVal[NEIGHBORKINDS] = -{3, 4, 6}; /* Neighborhoods, 8 just makes a mess */ +{3, 6}; /* Neighborhoods, 8 just makes a mess */ /* Relative ant moves */ @@ -503,11 +501,9 @@ fillcell(ModeInfo * mi, GC gc, int col, int row) XFillPolygon(MI_DISPLAY(mi), MI_WINDOW(mi), gc, ap->hexagonList, 6, Convex, CoordModePrevious); -#if 0 /* jwz sez: this looks like crap */ } else if (ap->neighbors == 4 || ap->neighbors == 8) { XFillRectangle(MI_DISPLAY(mi), MI_WINDOW(mi), gc, ap->xb + ap->xs * col, ap->yb + ap->ys * row, ap->xs, ap->ys); -#endif } else { /* TRI */ int orient = (col + row) % 2; /* O left 1 right */