Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove documented bug with long worm lengths, and improve handling of

Browse Source 
non-standard screen sizes.  From OpenBSD.
This commit is contained in:
jsm 2001-08-29 23:25:58 +00:00
parent 54b81ce0d6
commit 67d5106d8a
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
games/worm/worm.6
View File

@ -1,4 +1,4 @@
.\" $NetBSD: worm.6,v 1.6 1999/10/26 06:35:49 cgd Exp $
.\" $NetBSD: worm.6,v 1.7 2001/08/29 23:25:58 jsm Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@ -63,6 +63,3 @@ or itself. The current score (how much the worm has grown) is kept in
the upper left corner of the screen.
.Pp
The optional argument, if present, is the initial length of the worm.
.Sh BUGS
If the initial length of the worm is set to less than one or more
than 75, various strange things happen.

28
games/worm/worm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: worm.c,v 1.19 2000/05/08 07:56:06 mycroft Exp $ */
/* $NetBSD: worm.c,v 1.20 2001/08/29 23:25:58 jsm Exp $ */
/*
* Copyright (c) 1980, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)worm.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: worm.c,v 1.19 2000/05/08 07:56:06 mycroft Exp $");
__RCSID("$NetBSD: worm.c,v 1.20 2001/08/29 23:25:58 jsm Exp $");
#endif
#endif /* not lint */
@ -104,10 +104,6 @@ main(argc, argv)
/* Revoke setgid privileges */
setgid(getgid());
if (argc == 2)
start_len = atoi(argv[1]);
if ((start_len <= 0) || (start_len > 500))
start_len = LENGTH;
setbuf(stdout, outbuf);
srand(getpid());
signal(SIGALRM, wake);
@ -121,6 +117,10 @@ main(argc, argv)
#endif
slow = (baudrate() <= 1200);
clear();
if (argc == 2)
start_len = atoi(argv[1]);
if ((start_len <= 0) || (start_len > ((LINES-3) * (COLS-2)) / 3))
start_len = LENGTH;
stw = newwin(1, COLS-1, 0, 0);
tv = newwin(LINES-1, COLS-1, 1, 0);
box(tv, '*', '*');
@ -152,14 +152,14 @@ void
life()
{
struct body *bp, *np;
int i;
int i, j = 1;
np = NULL;
head = newlink();
if (head == NULL)
err(1, NULL);
head->x = start_len+2;
head->y = 12;
head->x = start_len % (COLS-5) + 2;
head->y = LINES / 2;
head->next = NULL;
display(head, HEAD);
for (i = 0, bp = head; i < start_len; i++, bp = np) {
@ -168,8 +168,14 @@ life()
err(1, NULL);
np->next = bp;
bp->prev = np;
np->x = bp->x - 1;
np->y = bp->y;
if (((bp->x <= 2) && (j == 1)) || ((bp->x >= COLS-4) && (j == -1))) {
j *= -1;
np->x = bp->x;
np->y = bp->y + 1;
} else {
np->x = bp->x - j;
np->y = bp->y;
}
display(np, BODY);
}
tail = np;