X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Floop.c;h=4a67f381644c600809b936ad62dbe54300c3605c;hb=3f438031d610c7e15fd33876a879b97e290e05fb;hp=a30d3213b36c09384fcb4c7fcb5c339aaa2da6da;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver diff --git a/hacks/loop.c b/hacks/loop.c index a30d3213..4a67f381 100644 --- a/hacks/loop.c +++ b/hacks/loop.c @@ -90,7 +90,7 @@ static const char sccsid[] = "@(#)loop.c 5.01 2000/03/15 xlockmore"; "*cycles: 1600 \n" \ "*size: -12 \n" \ "*ncolors: 15 \n" \ - "*neighbors: 0 \n" + #define UNIFORM_COLORS #include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ @@ -109,7 +109,7 @@ static int neighbors; static XrmOptionDescRec opts[] = { - {(char *) "-neighbors", (char *) ".loop.neighbors", XrmoptionSepArg, (caddr_t) NULL} + {"-neighbors", ".loop.neighbors", XrmoptionSepArg, 0} }; static argtype vars[] = @@ -119,7 +119,7 @@ static argtype vars[] = static OptionStruct desc[] = { - {(char *) "-neighbors num", (char *) "squares 4 or hexagons 6"} + {"-neighbors num", "squares 4 or hexagons 6"} }; ModeSpecOpt loop_opts = @@ -1140,7 +1140,7 @@ static void init_adam(ModeInfo * mi) { loopstruct *lp = &loops[MI_SCREEN(mi)]; - XPoint start, dirx, diry; + XPoint start = { 0, 0 }, dirx = { 0, 0 }, diry = { 0, 0 }; int i, j, dir; #ifdef DELAYDEBUGLOOP @@ -1425,6 +1425,9 @@ release_loop(ModeInfo * mi) } } +static void *stop_warning_about_triangleUnit_already; + + void init_loop(ModeInfo * mi) { @@ -1434,6 +1437,8 @@ init_loop(ModeInfo * mi) loopstruct *lp; XGCValues gcv; + stop_warning_about_triangleUnit_already = (void *) &triangleUnit; + if (loops == NULL) { if ((loops = (loopstruct *) calloc(MI_NUM_SCREENS(mi), sizeof (loopstruct))) == NULL)