Sync to 4.4BSD-Lite2

23 files changed, 87 insertions, 386 deletions

diff --git a/battlestar/battlestar.c b/battlestar/battlestar.c
index 078adb98..6eb0bc06 100644
--- a/battlestar/battlestar.c
+++ b/battlestar/battlestar.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 cgd Exp $	*/
+/*	$NetBSD: battlestar.c,v 1.4 1997/01/07 11:56:32 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,9 +41,9 @@ static char copyright[] =
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)battlestar.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)battlestar.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 cgd Exp $";
+static char rcsid[] = "$NetBSD: battlestar.c,v 1.4 1997/01/07 11:56:32 tls Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ static char rcsid[] = "$NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 cgd Exp $
  * on the Cory PDP-11/70, University of California, Berkeley.
  */
 
-#include "externs.h"
+#include "extern.h"
 
 main(argc,argv)
 int  argc;
diff --git a/battlestar/com1.c b/battlestar/com1.c
index 136e3aa7..958f583d 100644
--- a/battlestar/com1.c
+++ b/battlestar/com1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com1.c,v 1.3 1995/03/21 15:06:51 cgd Exp $	*/
+/*	$NetBSD: com1.c,v 1.4 1997/01/07 11:56:34 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)com1.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)com1.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: com1.c,v 1.3 1995/03/21 15:06:51 cgd Exp $";
+static char rcsid[] = "$NetBSD: com1.c,v 1.4 1997/01/07 11:56:34 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 move(thataway, token)
 int thataway, token;
diff --git a/battlestar/com2.c b/battlestar/com2.c
index 69a4ca14..a38afe4c 100644
--- a/battlestar/com2.c
+++ b/battlestar/com2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com2.c,v 1.3 1995/03/21 15:06:55 cgd Exp $	*/
+/*	$NetBSD: com2.c,v 1.4 1997/01/07 11:56:35 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)com2.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)com2.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: com2.c,v 1.3 1995/03/21 15:06:55 cgd Exp $";
+static char rcsid[] = "$NetBSD: com2.c,v 1.4 1997/01/07 11:56:35 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 wearit()		/* synonyms = {sheathe, sheath} */
 {
diff --git a/battlestar/com3.c b/battlestar/com3.c
index 1bb1889d..f389f05e 100644
--- a/battlestar/com3.c
+++ b/battlestar/com3.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com3.c,v 1.3 1995/03/21 15:07:00 cgd Exp $	*/
+/*	$NetBSD: com3.c,v 1.4 1997/01/07 11:56:35 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)com3.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)com3.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: com3.c,v 1.3 1995/03/21 15:07:00 cgd Exp $";
+static char rcsid[] = "$NetBSD: com3.c,v 1.4 1997/01/07 11:56:35 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 dig()
 {
diff --git a/battlestar/com4.c b/battlestar/com4.c
index 93e17fff..1439f607 100644
--- a/battlestar/com4.c
+++ b/battlestar/com4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com4.c,v 1.3 1995/03/21 15:07:04 cgd Exp $	*/
+/*	$NetBSD: com4.c,v 1.4 1997/01/07 11:56:36 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)com4.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)com4.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: com4.c,v 1.3 1995/03/21 15:07:04 cgd Exp $";
+static char rcsid[] = "$NetBSD: com4.c,v 1.4 1997/01/07 11:56:36 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 take(from)
 unsigned int from[];
diff --git a/battlestar/com5.c b/battlestar/com5.c
index 205bd1ad..114e0796 100644
--- a/battlestar/com5.c
+++ b/battlestar/com5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com5.c,v 1.3 1995/03/21 15:07:07 cgd Exp $	*/
+/*	$NetBSD: com5.c,v 1.4 1997/01/07 11:56:37 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)com5.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)com5.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: com5.c,v 1.3 1995/03/21 15:07:07 cgd Exp $";
+static char rcsid[] = "$NetBSD: com5.c,v 1.4 1997/01/07 11:56:37 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 kiss()
 {
diff --git a/battlestar/com6.c b/battlestar/com6.c
index 5b8b755f..af0e091f 100644
--- a/battlestar/com6.c
+++ b/battlestar/com6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com6.c,v 1.5 1995/04/27 21:30:23 mycroft Exp $	*/
+/*	$NetBSD: com6.c,v 1.6 1997/01/07 11:56:38 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)com6.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)com6.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: com6.c,v 1.5 1995/04/27 21:30:23 mycroft Exp $";
+static char rcsid[] = "$NetBSD: com6.c,v 1.6 1997/01/07 11:56:38 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 #include "pathnames.h"
 
 launch()
diff --git a/battlestar/com7.c b/battlestar/com7.c
index abe88577..f1649d4d 100644
--- a/battlestar/com7.c
+++ b/battlestar/com7.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com7.c,v 1.3 1995/03/21 15:07:12 cgd Exp $	*/
+/*	$NetBSD: com7.c,v 1.4 1997/01/07 11:56:39 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)com7.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)com7.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: com7.c,v 1.3 1995/03/21 15:07:12 cgd Exp $";
+static char rcsid[] = "$NetBSD: com7.c,v 1.4 1997/01/07 11:56:39 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 fight(enemy,strength)
 int enemy,strength;
diff --git a/battlestar/cypher.c b/battlestar/cypher.c
index 8d5d3f30..602259d7 100644
--- a/battlestar/cypher.c
+++ b/battlestar/cypher.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cypher.c,v 1.3 1995/03/21 15:07:15 cgd Exp $	*/
+/*	$NetBSD: cypher.c,v 1.4 1997/01/07 11:56:39 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)cypher.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)cypher.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: cypher.c,v 1.3 1995/03/21 15:07:15 cgd Exp $";
+static char rcsid[] = "$NetBSD: cypher.c,v 1.4 1997/01/07 11:56:39 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 cypher()
 {
diff --git a/battlestar/dayfile.c b/battlestar/dayfile.c
index ed511fae..b16fcfba 100644
--- a/battlestar/dayfile.c
+++ b/battlestar/dayfile.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dayfile.c,v 1.3 1995/03/21 15:07:18 cgd Exp $	*/
+/*	$NetBSD: dayfile.c,v 1.4 1997/01/07 11:56:40 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)dayfile.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)dayfile.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: dayfile.c,v 1.3 1995/03/21 15:07:18 cgd Exp $";
+static char rcsid[] = "$NetBSD: dayfile.c,v 1.4 1997/01/07 11:56:40 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 struct room dayfile[] = {
 	{ 0 },
diff --git a/battlestar/dayobjs.c b/battlestar/dayobjs.c
index 819ffb96..ec46c60b 100644
--- a/battlestar/dayobjs.c
+++ b/battlestar/dayobjs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dayobjs.c,v 1.3 1995/03/21 15:07:22 cgd Exp $	*/
+/*	$NetBSD: dayobjs.c,v 1.4 1997/01/07 11:56:41 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #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[] = "$NetBSD: dayobjs.c,v 1.3 1995/03/21 15:07:22 cgd Exp $";
+static char rcsid[] = "$NetBSD: dayobjs.c,v 1.4 1997/01/07 11:56:41 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 struct objs dayobjs[] = {
 	{ 236,	HORSE },
diff --git a/battlestar/extern.h b/battlestar/extern.h
index 76cf14a1..c044a9a5 100644
--- a/battlestar/extern.h
+++ b/battlestar/extern.h
@@ -33,8 +33,9 @@
  *	@(#)externs.h	8.1 (Berkeley) 5/31/93
  */
 
-#include <sys/signal.h>
+#include <signal.h>
 #include <stdio.h>
+#include <string.h>
 
 #define BITS (8 * sizeof (int))
 
diff --git a/battlestar/externs.h b/battlestar/externs.h
deleted file mode 100644
index ab7f0203..00000000
--- a/battlestar/externs.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*	$NetBSD: externs.h,v 1.5 1995/04/24 12:22:18 cgd Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)externs.h	8.1 (Berkeley) 5/31/93
- */
-
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-
-#define BITS (8 * sizeof (int))
-
-#define OUTSIDE		(position > 68 && position < 246 && position != 218)
-#define rnd(x)		(rand() % (x))
-#define max(a,b)	((a) < (b) ? (b) : (a))
-#define testbit(array, index)	(array[index/BITS] & (1 << (index % BITS)))
-#define setbit(array, index)	(array[index/BITS] |= (1 << (index % BITS)))
-#define clearbit(array, index)	(array[index/BITS] &= ~(1 << (index % BITS)))
-
-	/* well known rooms */
-#define FINAL	275
-#define GARDEN	197
-#define POOLS	126
-#define DOCK	93
-
-	/* word types */
-#define VERB	0
-#define OBJECT  1
-#define NOUNS	2
-#define PREPS	3
-#define ADJS	4
-#define CONJ	5
-
-	/* words numbers */
-#define KNIFE		0 
-#define SWORD		1
-#define LAND		2
-#define WOODSMAN 	3
-#define TWO_HANDED	4
-#define CLEAVER		5
-#define BROAD		6
-#define MAIL		7
-#define HELM		8
-#define SHIELD		9
-#define MAID		10
-#define BODY		10
-#define VIPER		11
-#define LAMPON		12
-#define SHOES		13
-#define CYLON		14
-#define PAJAMAS		15
-#define ROBE		16
-#define AMULET		17
-#define MEDALION	18
-#define TALISMAN	19
-#define DEADWOOD	20
-#define MALLET		21
-#define LASER		22
-#define BATHGOD		23
-#define NORMGOD		24
-#define GRENADE		25
-#define CHAIN		26
-#define ROPE		27
-#define LEVIS		28
-#define MACE		29
-#define SHOVEL		30
-#define HALBERD		31
-#define	COMPASS		32
-#define	CRASH		33
-#define ELF		34
-#define FOOT		35
-#define COINS		36
-#define MATCHES		37
-#define MAN		38
-#define PAPAYAS		39
-#define PINEAPPLE	40
-#define KIWI		41
-#define COCONUTS	42
-#define MANGO		43
-#define RING		44
-#define POTION		45
-#define BRACELET	46
-#define GIRL		47
-#define GIRLTALK	48
-#define DARK		49
-#define TIMER		50
-#define CHAR		53
-#define BOMB		54
-#define DEADGOD		55
-#define DEADTIME	56
-#define DEADNATIVE	57
-#define NATIVE		58
-#define HORSE		59
-#define CAR		60
-#define POT		61
-#define BAR		62
-#define	BLOCK		63
-#define NUMOFOBJECTS	64
-	/* non-objects below */
-#define UP	1000
-#define DOWN	1001
-#define AHEAD	1002
-#define BACK	1003
-#define RIGHT	1004
-#define LEFT	1005
-#define TAKE	1006
-#define USE	1007
-#define LOOK	1008
-#define QUIT	1009
-#define NORTH	1010
-#define SOUTH	1011
-#define EAST	1012
-#define WEST	1013
-#define SU      1014
-#define DROP	1015
-#define TAKEOFF	1016
-#define DRAW	1017
-#define PUTON	1018
-#define WEARIT	1019
-#define PUT	1020
-#define INVEN	1021
-#define EVERYTHING 1022
-#define AND	1023
-#define KILL	1024
-#define RAVAGE	1025
-#define UNDRESS	1026
-#define THROW	1027
-#define LAUNCH	1028
-#define LANDIT	1029
-#define LIGHT	1030
-#define FOLLOW	1031
-#define KISS	1032
-#define LOVE	1033
-#define GIVE	1034
-#define SMITE	1035
-#define SHOOT	1036
-#define ON	1037
-#define	OFF	1038
-#define TIME	1039
-#define SLEEP	1040
-#define DIG	1041
-#define EAT	1042
-#define SWIM	1043
-#define DRINK	1044
-#define DOOR	1045
-#define SAVE	1046
-#define RIDE	1047
-#define DRIVE	1048
-#define SCORE	1049
-#define BURY	1050 
-#define JUMP	1051
-#define KICK	1052
-
-	/* injuries */
-#define ARM	6		/* broken arm */
-#define RIBS	7		/* broken ribs */
-#define SPINE	9		/* broken back */
-#define SKULL	11		/* fractured skull */
-#define INCISE	10		/* deep incisions */
-#define NECK	12		/* broken NECK */
-#define NUMOFINJURIES 13
-
-	/* notes */
-#define	CANTLAUNCH	0
-#define LAUNCHED	1
-#define CANTSEE		2
-#define CANTMOVE	3 
-#define JINXED		4
-#define DUG		5
-#define NUMOFNOTES	6
-
-	/* fundamental constants */
-#define NUMOFROOMS	275
-#define NUMOFWORDS	((NUMOFOBJECTS + BITS - 1) / BITS)
-#define LINELENGTH	81
-
-#define TODAY		0
-#define TONIGHT		1
-#define CYCLE		100
-
-	/* initial variable values */
-#define TANKFULL	250
-#define TORPEDOES	10
-#define MAXWEIGHT	60
-#define MAXCUMBER	10
-
-struct room {
-	char *name;
-	int link[8];
-#define north	link[0]
-#define south	link[1]
-#define east	link[2]
-#define west	link[3]
-#define up	link[4]
-#define access	link[5]
-#define down	link[6]
-#define flyhere	link[7]
-	char *desc;
-	unsigned int objects[NUMOFWORDS];
-};
-struct room dayfile[];
-struct room nightfile[];
-struct room *location;
-
-	/* object characteristics */
-char *objdes[NUMOFOBJECTS];
-char *objsht[NUMOFOBJECTS];
-char *ouch[NUMOFINJURIES];
-int objwt[NUMOFOBJECTS];
-int objcumber[NUMOFOBJECTS];
-
-	/* current input line */
-#define NWORD	20			/* words per line */
-char words[NWORD][15];
-int wordvalue[NWORD];
-int wordtype[NWORD];
-int wordcount, wordnumber;
-
-char *truedirec(), *rate();
-char *getcom(), *getword();
-
-	/* state of the game */
-int time;
-int position;
-int direction;
-int left, right, ahead, back;
-int clock, fuel, torps;
-int carrying, encumber;
-int rythmn;
-int followfight;
-int ate;
-int snooze;
-int meetgirl;
-int followgod;
-int godready;
-int win;
-int wintime;
-int wiz;
-int tempwiz;
-int matchlight, matchcount;
-int loved;
-int pleasure, power, ego;
-int WEIGHT;
-int CUMBER;
-int notes[NUMOFNOTES];
-unsigned int inven[NUMOFWORDS];
-unsigned int wear[NUMOFWORDS];
-char beenthere[NUMOFROOMS+1];
-char injuries[NUMOFINJURIES];
-
-char uname[9];
-
-struct wlist {
-	char *string;
-	int value, article;
-	struct wlist *next;
-};
-#define HASHSIZE	256
-#define HASHMUL		81
-#define HASHMASK	(HASHSIZE - 1)
-struct wlist *hashtab[HASHSIZE];
-struct wlist wlist[];
-
-struct objs {
-	short room;
-	short obj;
-};
-struct objs dayobjs[];
-struct objs nightobjs[];
diff --git a/battlestar/fly.c b/battlestar/fly.c
index b98364e9..f3c2db98 100644
--- a/battlestar/fly.c
+++ b/battlestar/fly.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fly.c,v 1.3 1995/03/21 15:07:28 cgd Exp $	*/
+/*	$NetBSD: fly.c,v 1.4 1997/01/07 11:56:44 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)fly.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)fly.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: fly.c,v 1.3 1995/03/21 15:07:28 cgd Exp $";
+static char rcsid[] = "$NetBSD: fly.c,v 1.4 1997/01/07 11:56:44 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 #undef UP
 #include <curses.h>
 
diff --git a/battlestar/globals.c b/battlestar/globals.c
index 66f5af63..4004c67e 100644
--- a/battlestar/globals.c
+++ b/battlestar/globals.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: globals.c,v 1.3 1995/03/21 15:07:32 cgd Exp $	*/
+/*	$NetBSD: globals.c,v 1.4 1997/01/07 11:56:44 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)globals.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)globals.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: globals.c,v 1.3 1995/03/21 15:07:32 cgd Exp $";
+static char rcsid[] = "$NetBSD: globals.c,v 1.4 1997/01/07 11:56:44 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 int WEIGHT = MAXWEIGHT;
 int CUMBER = MAXCUMBER;
diff --git a/battlestar/init.c b/battlestar/init.c
index 2a798ee1..b05d545c 100644
--- a/battlestar/init.c
+++ b/battlestar/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.4 1995/03/21 15:07:35 cgd Exp $	*/
+/*	$NetBSD: init.c,v 1.5 1997/01/07 11:56:45 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,14 +35,14 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)init.c	8.4 (Berkeley) 4/30/95";
 #else
-static char rcsid[] = "$NetBSD: init.c,v 1.4 1995/03/21 15:07:35 cgd Exp $";
+static char rcsid[] = "$NetBSD: init.c,v 1.5 1997/01/07 11:56:45 tls Exp $";
 #endif
 #endif /* not lint */
 
 #include <sys/types.h>
-#include "externs.h"
+#include "extern.h"
 #include <pwd.h>
 
 initialize(startup)
@@ -54,11 +54,11 @@ initialize(startup)
 	puts("Version 4.2, fall 1984.");
 	puts("First Adventure game written by His Lordship, the honorable");
 	puts("Admiral D.W. Riggle\n");
+	location = dayfile;
 	srand(getpid());
 	getutmp(uname);
 	wordinit();
 	if (startup) {
-		location = dayfile;
 		direction = NORTH;
 		time = 0;
 		snooze = CYCLE * 1.5;
diff --git a/battlestar/misc.c b/battlestar/misc.c
index 590760bf..b0025758 100644
--- a/battlestar/misc.c
+++ b/battlestar/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.3 1995/03/21 15:07:37 cgd Exp $	*/
+/*	$NetBSD: misc.c,v 1.4 1997/01/07 11:56:46 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)misc.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: misc.c,v 1.3 1995/03/21 15:07:37 cgd Exp $";
+static char rcsid[] = "$NetBSD: misc.c,v 1.4 1997/01/07 11:56:46 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 card(array, size)		/* for beenthere, injuries */
 	register char *array;
diff --git a/battlestar/nightfile.c b/battlestar/nightfile.c
index 91c901ff..f7c1dfd0 100644
--- a/battlestar/nightfile.c
+++ b/battlestar/nightfile.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nightfile.c,v 1.3 1995/03/21 15:07:41 cgd Exp $	*/
+/*	$NetBSD: nightfile.c,v 1.4 1997/01/07 11:56:47 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)nightfile.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)nightfile.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: nightfile.c,v 1.3 1995/03/21 15:07:41 cgd Exp $";
+static char rcsid[] = "$NetBSD: nightfile.c,v 1.4 1997/01/07 11:56:47 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 struct room nightfile[] = {
 	{ 0 },
diff --git a/battlestar/nightobjs.c b/battlestar/nightobjs.c
index e3efd2d9..12b3c1b3 100644
--- a/battlestar/nightobjs.c
+++ b/battlestar/nightobjs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nightobjs.c,v 1.3 1995/03/21 15:07:46 cgd Exp $	*/
+/*	$NetBSD: nightobjs.c,v 1.4 1997/01/07 11:56:48 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)nightobjs.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)nightobjs.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: nightobjs.c,v 1.3 1995/03/21 15:07:46 cgd Exp $";
+static char rcsid[] = "$NetBSD: nightobjs.c,v 1.4 1997/01/07 11:56:48 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 struct objs nightobjs[] = {
 	{ 218,	PAJAMAS },
diff --git a/battlestar/parse.c b/battlestar/parse.c
index 27add0c7..d359c547 100644
--- a/battlestar/parse.c
+++ b/battlestar/parse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.3 1995/03/21 15:07:48 cgd Exp $	*/
+/*	$NetBSD: parse.c,v 1.4 1997/01/07 11:56:49 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)parse.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: parse.c,v 1.3 1995/03/21 15:07:48 cgd Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.4 1997/01/07 11:56:49 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 wordinit()
 {
diff --git a/battlestar/room.c b/battlestar/room.c
index 631baf9d..751c4069 100644
--- a/battlestar/room.c
+++ b/battlestar/room.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: room.c,v 1.3 1995/03/21 15:07:54 cgd Exp $	*/
+/*	$NetBSD: room.c,v 1.4 1997/01/07 11:56:49 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)room.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)room.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: room.c,v 1.3 1995/03/21 15:07:54 cgd Exp $";
+static char rcsid[] = "$NetBSD: room.c,v 1.4 1997/01/07 11:56:49 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 writedes()
 {
diff --git a/battlestar/save.c b/battlestar/save.c
index 85c85951..91dbb825 100644
--- a/battlestar/save.c
+++ b/battlestar/save.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: save.c,v 1.3 1995/03/21 15:07:57 cgd Exp $	*/
+/*	$NetBSD: save.c,v 1.4 1997/01/07 11:56:50 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)save.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: save.c,v 1.3 1995/03/21 15:07:57 cgd Exp $";
+static char rcsid[] = "$NetBSD: save.c,v 1.4 1997/01/07 11:56:50 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 restore()
 {
diff --git a/battlestar/words.c b/battlestar/words.c
index 64dac12a..5b153f2e 100644
--- a/battlestar/words.c
+++ b/battlestar/words.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: words.c,v 1.3 1995/03/21 15:08:00 cgd Exp $	*/
+/*	$NetBSD: words.c,v 1.4 1997/01/07 11:56:51 tls Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,13 +35,13 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)words.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)words.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: words.c,v 1.3 1995/03/21 15:08:00 cgd Exp $";
+static char rcsid[] = "$NetBSD: words.c,v 1.4 1997/01/07 11:56:51 tls Exp $";
 #endif
 #endif /* not lint */
 
-#include "externs.h"
+#include "extern.h"
 
 struct wlist wlist[] = {
 	{ "knife",	KNIFE,		OBJECT },