diff options
| author | Paul Janzen <pjanzen@cvs.openbsd.org> | 1999-09-25 20:30:47 +0000 |
|---|---|---|
| committer | Paul Janzen <pjanzen@cvs.openbsd.org> | 1999-09-25 20:30:47 +0000 |
| commit | 707fbeced379c66976d1a780f9d53537d5a553e0 (patch) | |
| tree | 877cb9d7ad6143f6564fcf73d9296baffe528cf7 /games/battlestar/dayobjs.c | |
| parent | c32c077e88142dbeafe3f3158a6100cfb0fb8a36 (diff) | |
Merge 4.4BSD-Lite2 and NetBSD, including improved save file handling of
jsm28@cam.ac.uk. Rename setbit() family of macros so as not to conflict
with <sys/param.h>.
Diffstat (limited to 'games/battlestar/dayobjs.c')
| -rw-r--r-- | games/battlestar/dayobjs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/games/battlestar/dayobjs.c b/games/battlestar/dayobjs.c index 26bc307e2a5..61413a9cba3 100644 --- a/games/battlestar/dayobjs.c +++ b/games/battlestar/dayobjs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dayobjs.c,v 1.4 1998/09/13 01:30:31 pjanzen Exp $ */ +/* $OpenBSD: dayobjs.c,v 1.5 1999/09/25 20:30:45 pjanzen Exp $ */ /* $NetBSD: dayobjs.c,v 1.3 1995/03/21 15:07:22 cgd Exp $ */ /* @@ -36,15 +36,15 @@ #ifndef lint #if 0 -static char sccsid[] = "@(#)dayobjs.c 8.1 (Berkeley) 5/31/93"; +static char sccsid[] = "@(#)dayobjs.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: dayobjs.c,v 1.4 1998/09/13 01:30:31 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: dayobjs.c,v 1.5 1999/09/25 20:30:45 pjanzen Exp $"; #endif #endif /* not lint */ #include "extern.h" -struct objs dayobjs[] = { +const struct objs dayobjs[] = { { 236, HORSE }, { 237, CAR }, { 275, POT }, @@ -141,5 +141,5 @@ struct objs dayobjs[] = { { 130, BRACELET }, { 93, GIRL }, { 268, LAMPON }, - { 0 } + { 0, 0 } }; |