ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.21.tar.gz

[xscreensaver] / hacks / ant.c

diff --git a/hacks/ant.c b/hacks/ant.c
index f41f19dee18561d93799b5d2d03aaee52a85f7b7..bb0d3eba3c6a6e1df3bdf3b93c8513c67eaf903f 100644 (file)
--- a/hacks/ant.c
+++ b/hacks/ant.c
@@ -4,9 +4,8 @@
  *         as Greg Turk's turmites) whose tape is the screen
  */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)ant.c        5.00 2000/11/01 xlockmore";
-
 #endif
 
 /*-
@@ -64,8 +63,7 @@ static const char sccsid[] = "@(#)ant.c       5.00 2000/11/01 xlockmore";
  "*cycles: 40000 \n" \
  "*size: -12 \n" \
  "*ncolors: 64 \n" \
- "*neighbors: 0 \n" \
- "*sharpturn: False \n"
+
 #include "xlockmore.h"         /* in xscreensaver distribution */
 #include "erase.h"
 #else /* STANDALONE */
@@ -91,30 +89,27 @@ static Bool sharpturn;
 
 static XrmOptionDescRec opts[] =
 {
-       {(char *) "-neighbors", (char *) ".ant.neighbors", XrmoptionSepArg, (caddr_t) NULL},
-       {(char *) "-truchet", (char *) ".ant.truchet", XrmoptionNoArg, (caddr_t) "on"},
-       {(char *) "+truchet", (char *) ".ant.truchet", XrmoptionNoArg, (caddr_t) "off"},
-       {(char *) "-eyes", (char *) ".ant.eyes", XrmoptionNoArg, (caddr_t) "on"},
-       {(char *) "+eyes", (char *) ".ant.eyes", XrmoptionNoArg, (caddr_t) "off"},
-       {(char *) "-sharpturn", (char *) ".ant.sharpturn", XrmoptionNoArg, (caddr_t) "on"},
-       {(char *) "+sharpturn", (char *) ".ant.sharpturn", XrmoptionNoArg, (caddr_t) "off"},
-       {"-neighbors", ".ant.neighbors", XrmoptionSepArg, (caddr_t) 0},
-       {"+neighbors", ".ant.neighbors", XrmoptionSepArg, (caddr_t) 0}
+       {"-neighbors", ".ant.neighbors", XrmoptionSepArg, 0},
+       {"-truchet", ".ant.truchet", XrmoptionNoArg, "on"},
+       {"+truchet", ".ant.truchet", XrmoptionNoArg, "off"},
+       {"-eyes", ".ant.eyes", XrmoptionNoArg, "on"},
+       {"+eyes", ".ant.eyes", XrmoptionNoArg, "off"},
+       {"-sharpturn", ".ant.sharpturn", XrmoptionNoArg, "on"},
+       {"+sharpturn", ".ant.sharpturn", XrmoptionNoArg, "off"},
 };
 static argtype vars[] =
 {
-       {(caddr_t *) & neighbors, (char *) "neighbors", (char *) "Neighbors", (char *) DEF_NEIGHBORS, t_Int},
-       {(caddr_t *) & truchet, (char *) "truchet", (char *) "Truchet", (char *) DEF_TRUCHET, t_Bool},
-       {(caddr_t *) & eyes, (char *) "eyes", (char *) "Eyes", (char *) DEF_EYES, t_Bool},
-   {(caddr_t *) & sharpturn, (char *) "sharpturn", (char *) "SharpTurn", (char *) DEF_SHARPTURN, t_Bool},
-       {(caddr_t *) & neighbors, "neighbors", "Neighbors", DEF_NEIGHBORS, t_Int}
+       {&neighbors, "neighbors", "Neighbors", DEF_NEIGHBORS, t_Int},
+       {&truchet,   "truchet",   "Truchet",   DEF_TRUCHET,   t_Bool},
+       {&eyes,      "eyes",      "Eyes",      DEF_EYES,      t_Bool},
+    {&sharpturn, "sharpturn", "SharpTurn", DEF_SHARPTURN, t_Bool},
 };
 static OptionStruct desc[] =
 {
-       {(char *) "-neighbors num", (char *) "squares 4 or 8, hexagons 6, triangles 3 or 12"},
-       {(char *) "-/+truchet", (char *) "turn on/off Truchet lines"},
-       {(char *) "-/+eyes", (char *) "turn on/off eyes"},
-       {(char *) "-/+sharpturn", (char *) "turn on/off sharp turns (6, 8 or 12 neighbors only)"}
+       {"-neighbors num", "squares 4 or 8, hexagons 6, triangles 3 or 12"},
+       {"-/+truchet", "turn on/off Truchet lines"},
+       {"-/+eyes", "turn on/off eyes"},
+       {"-/+sharpturn", "turn on/off sharp turns (6, 8 or 12 neighbors only)"}
 };
 
 ModeSpecOpt ant_opts =