X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fpenrose.c;h=a15f0009e13ee34e62374063893995755dcf606c;hp=0ec7d9739a0c409d95ee95b382023c6d106f463a;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3

diff --git a/hacks/penrose.c b/hacks/penrose.c
index 0ec7d973..a15f0009 100644
--- a/hacks/penrose.c
+++ b/hacks/penrose.c
@@ -18,9 +18,8 @@
                                 http://www.nine.org/notw/notw.html
  */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)penrose.c	5.00 2000/11/01 xlockmore";
-
 #endif
 
 /*-
@@ -104,16 +103,16 @@ static Bool ammann;
 
 static XrmOptionDescRec opts[] =
 {
-	{(char *) "-ammann", (char *) ".penrose.ammann", XrmoptionNoArg, (caddr_t) "on"},
-	{(char *) "+ammann", (char *) ".penrose.ammann", XrmoptionNoArg, (caddr_t) "off"}
+	{"-ammann", ".penrose.ammann", XrmoptionNoArg, "on"},
+	{"+ammann", ".penrose.ammann", XrmoptionNoArg, "off"}
 };
 static argtype vars[] =
 {
-	{(caddr_t *) & ammann, (char *) "ammann", (char *) "Ammann", (char *) DEF_AMMANN, t_Bool}
+	{&ammann, "ammann", "Ammann", DEF_AMMANN, t_Bool}
 };
 static OptionStruct desc[] =
 {
-	{(char *) "-/+ammann", (char *) "turn on/off Ammann lines"}
+	{"-/+ammann", "turn on/off Ammann lines"}
 };
 
 ModeSpecOpt penrose_opts =
@@ -441,10 +440,14 @@ init_penrose(ModeInfo * mi)
 	}
 	tp = &tilings[MI_SCREEN(mi)];
 
+#if 0 /* if you do this, then the -ammann and -no-ammann options don't work.
+         -- jwz */
 	if (MI_IS_FULLRANDOM(mi))
 		tp->ammann = (Bool) (LRAND() & 1);
 	else
+#endif /* 0 */
 		tp->ammann = ammann;
+
 	tp->done = False;
 	tp->busyLoop = 0;
 	tp->failures = 0;