 @@ -1,14 +1,14 @@
-/*	$NetBSD: bill.c,v 1.9 2008/02/03 03:49:15 dholland Exp $	 */
+/*	$NetBSD: bill.c,v 1.10 2009/08/12 08:04:05 dholland Exp $	 */
 /*-
  * Copyright (c) 1991 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.
 @@ -24,43 +24,43 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)bill.c	5.2 (Berkeley) 5/28/91";
 #else
-__RCSID("$NetBSD: bill.c,v 1.9 2008/02/03 03:49:15 dholland Exp $");
+__RCSID("$NetBSD: bill.c,v 1.10 2009/08/12 08:04:05 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <sys/file.h>
 #include <sys/wait.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <paths.h>
 #include "header.h"
 #include "extern.h"
 /* bill.c		 Larn is copyrighted 1986 by Noah Morgan. */
-const char *mail[] = {
+static const char *mail[] = {
 	"From: the LRS (Larn Revenue Service)\n",
 	"~s undeclared income\n",
 	"\n   We have heard you survived the caverns of Larn.  Let me be the",
 	"\nfirst to congratulate you on your success.  It was quite a feat.",
 	"\nIt was also very profitable for you...",
 	"\n\n   The Dungeon Master has informed us that you brought",
 	"1",
 	"\ncounty of Larn is in dire need of funds, we have spared no time",
 	"2",
 	"\nof this notice, and is due within 5 days.  Failure to pay will",
 	"\nmean penalties.  Once again, congratulations, We look forward",
 	"\nto your future successful expeditions.\n",
 	NULL,

 @@ -1,35 +1,35 @@
-/*	$NetBSD: display.c,v 1.8 2008/02/03 19:20:41 dholland Exp $	*/
+/*	$NetBSD: display.c,v 1.9 2009/08/12 08:04:05 dholland Exp $	*/
 /* display.c		Larn is copyrighted 1986 by Noah Morgan. */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: display.c,v 1.8 2008/02/03 19:20:41 dholland Exp $");
+__RCSID("$NetBSD: display.c,v 1.9 2009/08/12 08:04:05 dholland Exp $");
 #endif /* not lint */
 #include "header.h"
 #include "extern.h"
 #define makecode(_a,_b,_c) (((_a)<<16) + ((_b)<<8) + (_c))
 static void bot_hpx(void);
 static void bot_spellx(void);
 static void botside(void);
 static void botsub(int, const char *);
 static void seepage(void);
 static int      minx, maxx, miny, maxy, k, m;
 static char     bot1f = 0, bot2f = 0, bot3f = 0;
-char            always = 0;
+static char always = 0;
 /*
 	bottomline()
 	now for the bottom line of the display
  */
 void
 bottomline()
+{
 	recalc();
 	bot1f = 1;
+}
 void
 @@ -231,27 +231,27 @@ botsub(int idx, const char *str)
 	if (c[idx] != cbak[idx]) {
 		cbak[idx] = c[idx];
 		cursor(x, y);
 		lprintf(str, (long) c[idx]);
+	}
+}
 /*
  *	subroutine to draw only a section of the screen
  *	only the top section of the screen is updated.
  *	If entire lines are being drawn, then they will be cleared first.
  */
 /* for limited screen drawing */
-int             d_xmin = 0, d_xmax = MAXX, d_ymin = 0, d_ymax = MAXY;
+static int d_xmin = 0, d_xmax = MAXX, d_ymin = 0, d_ymax = MAXY;
 void
 draws(xmin, xmax, ymin, ymax)
 	int             xmin, xmax, ymin, ymax;
+{
 	int    i, idx;
 	if (xmin == 0 && xmax == MAXX) {	/* clear section of screen as
 						 * needed */
 		if (ymin == 0)
 			cl_up(79, ymax);
 		else
 			for (i = ymin; i < ymin; i++)
 				cl_line(1, i + 1);
 @@ -270,27 +270,28 @@ draws(xmin, xmax, ymin, ymax)
 				cursor(70, i + 1);
 				lprcat(bot_data[i].string);
+			}
 			cbak[idx] = c[idx];
+		}
+	}
+}
 /*
 	drawscreen()
 	subroutine to redraw the whole screen as the player knows it
  */
-u_char            screen[MAXX][MAXY], d_flag;	/* template for the screen */
+u_char            screen[MAXX][MAXY];	/* template for the screen */
 static u_char d_flag;
 void
 drawscreen()
+{
 	int    i, j, kk;
 	int             lastx, lasty;	/* variables used to optimize the
 					 * object printing */
 	if (d_xmin == 0 && d_xmax == MAXX && d_ymin == 0 && d_ymax == MAXY) {
 		d_flag = 1;
 		clear();	/* clear the screen */
 	} else {
 		d_flag = 0;
 		cursor(1, 1);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: extern.h,v 1.12 2008/02/19 06:05:26 dholland Exp $	*/
+/*	$NetBSD: extern.h,v 1.13 2009/08/12 08:04:05 dholland Exp $	*/
 /*
  * Copyright (c) 1997 Christos Zoulas.  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
 @@ -103,27 +103,26 @@ int nearbymonst(void);
 int stealsomething(void);
 int emptyhanded(void);
 void creategem(void);
 void adjustcvalues(int, int);
 int getpassword(void);
 int getyn(void);
 int packweight(void);
 int rnd(int);
 int rund(int);
 /* help.c */
 void help(void);
 void welcome(void);
 void retcont(void);
 /* io.c */
 void setupvt100(void);
 void clearvt100(void);
 int ttgetch(void);
 void scbr(void);
 void sncbr(void);
 void newgame(void);
 void lprintf(const char *, ...) __attribute__((__format__(__printf__, 1, 2)));
 void lprint(long);
 void lwrite(char *, int);
 long lgetc(void);
 long larn_lrint(void);
 @@ -140,158 +139,93 @@ void cursor(int, int);
 void cursors(void);
 void init_term(void);
 void cl_line(int, int);
 void cl_up(int, int);
 void cl_dn(int, int);
 void standout(const char *);
 void set_score_output(void);
 void lflush(void);
 char *tmcapcnv(char *, char *);
 void beep(void);
 /* main.c */
 int main(int, char **);
 void showstr(void);
 void qshowstr(void);
 void t_setup(int);
 void t_endup(int);
 void showwear(void);
 void showwield(void);
 void showread(void);
 void showeat(void);
 void showquaff(void);
 void show1(int, const char *[]);
 void show3(int);
 void randmonst(void);
 void parse(void);
 void parse2(void);
 void run(int);
 void wield(void);
 void ydhi(int);
 void ycwi(int);
 void wear(void);
 void dropobj(void);
 void readscr(void);
 void eatcookie(void);
 void quaff(void);
 unsigned long readnum(long);
 void szero(char *);
 /* monster.c */
 void createmonster(int);
 void createitem(int, int);
 void cast(void);
 void speldamage(int);
 void loseint(void);
 int isconfuse(void);
 int nospell(int, int);
 int fullhit(int);
 void direct(int, int, const char *, int);
 void godirect(int, int, const char *, int, int);
 void ifblind(int, int);
 void tdirect(int);
 void omnidirect(int, int, const char *);
 int vxy(int *, int *);
 void dirpoly(int);
 void hitmonster(int, int);
 int hitm(int, int, int);
 void hitplayer(int, int);
 void dropgold(int);
 void something(int);
 int newobject(int, int *);
 void checkloss(int);
 int annihilate(void);
 int newsphere(int, int, int, int);
 int rmsphere(int, int);
 void sphboom(int, int);
 void genmonst(void);
 /* moreobj.c */
 void oaltar(void);
 void othrone(int);
 void odeadthrone(void);
 void ochest(void);
 void ofountain(void);
 void fntchange(int);
 /* movem.c */
 void movemonst(void);
 void movemt(int, int);
 void mmove(int, int, int, int);
 void movsphere(void);
 /* nap.c */
 void nap(int);
 /* object.c */
 void lookforobject(void);
 void finditem(int);
 void ostairs(int);
 void oteleport(int);
 void opotion(int);
 void quaffpotion(int);
 void oscroll(int);
 void adjusttime(long);
 void read_scroll(int);
 void oorb(void);
 void opit(void);
 void obottomless(void);
 void oelevator(int);
 void ostatue(void);
 void omirror(void);
 void obook(void);
 void readbook(int);
 void ocookie(void);
 void ogold(int);
 void ohome(void);
 void iopts(void);
 void ignore(void);
 /* regen.c */
 void regen(void);
 /* savelev.c */
 void savelevel(void);
 void getlevel(void);
 /* scores.c */
 int readboard(void);
 int writeboard(void);
 int makeboard(void);
 int hashewon(void);
 long paytaxes(long);
 int winshou(void);
 int shou(int);
 void showscores(void);
 void showallscores(void);
 int sortboard(void);
 void newscore(long, char *, int, int);
 void new1sub(long, int, char *, long);
 void new2sub(long, int, char *, int);
 void died(int);
 void diedsub(int);
 void diedlog(void);
 int getplid(char *);
 /* signal.c */
 void sigsetup(void);
 /* store.c */
 void dnd_2hed(void);
 void dnd_hed(void);
 void dndstore(void);
 void sch_hed(void);
 void oschool(void);
 void obank(void);
 void obank2(void);
 void ointerest(void);
 void obanksub(void);
 void appraise(int);
 void otradepost(void);
 void cnsitm(void);
 void olrs(void);
 /* tok.c */
 int yylex(void);
 void flushall(void);
 void sethard(int);
 void readopts(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fortune.c,v 1.6 2008/01/28 05:38:53 dholland Exp $	*/
+/*	$NetBSD: fortune.c,v 1.7 2009/08/12 08:04:05 dholland Exp $	*/
 /*-
  * Copyright (c) 1991 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.
 @@ -24,41 +24,41 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char     sccsid[] = "@(#)fortune.c	5.5 (Berkeley) 6/10/91";
 #else
-__RCSID("$NetBSD: fortune.c,v 1.6 2008/01/28 05:38:53 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.7 2009/08/12 08:04:05 dholland Exp $");
 #endif
 #endif				/* not lint */
 #include <stdlib.h>
 #include "header.h"
 #include "extern.h"
 /* fortune.c		 Larn is copyrighted 1986 by Noah Morgan. */
 /*
  * function to return a random fortune from the fortune file
  */
-const char     *flines[] = {
+static const char *flines[] = {
 	"gem value = gem * 2 ^ perfection",
 	"sitting down can have unexpected results",
 	"don't pry into the affairs of others",
 	"drinking can be hazardous to your health",
 	"beware of the gusher!",
 	"some monsters are greedy",
 	"nymphs have light fingers",
 	"try kissing a disenchantress!",
 	"hammers and brains don't mix",
 	"what does a potion of cure dianthroritis taste like?",
 	"hit point gain/loss when raising a level depends on constitution",
 	"healing a mighty wizard can be exhilarating",
 	"be sure to pay your taxes",

 @@ -1,33 +1,37 @@
-/*	$NetBSD: movem.c,v 1.6 2008/01/28 05:38:54 dholland Exp $	*/
+/*	$NetBSD: movem.c,v 1.7 2009/08/12 08:04:05 dholland Exp $	*/
 /*
  * movem.c (move monster)		Larn is copyrighted 1986 by Noah Morgan.
+ *
  * Here are the functions in this file:
+ *
  * movemonst()		Routine to move the monsters toward the player
  * movemt(x,y)		Function to move a monster at (x,y) -- must determine where
  * mmove(x,y,xd,yd)	Function to actually perform the monster movement
  * movsphere() 		Function to look for and move spheres of annihilation
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: movem.c,v 1.6 2008/01/28 05:38:54 dholland Exp $");
+__RCSID("$NetBSD: movem.c,v 1.7 2009/08/12 08:04:05 dholland Exp $");
 #endif				/* not lint */
 #include "header.h"
 #include "extern.h"
 static void movemt(int, int);
 static void mmove(int, int, int, int);
 static void movsphere(void);
 /*
  * movemonst()		Routine to move the monsters toward the player
+ *
  * This routine has the responsibility to determine which monsters are to
  * move, and call movemt() to do the move.
  * Returns no value.
  */
 static short    w1[9], w1x[9], w1y[9];
 static int      tmp1, tmp2, tmp3, tmp4, distance;
 void
 movemonst()
+{
 	int    i, j;
 @@ -117,27 +121,27 @@ movemonst()
+		}
+	}
+}
 /*
  * movemt(x,y)		Function to move a monster at (x,y) -- must determine where
  * 	int x,y;
+ *
  * This routine is responsible for determining where one monster at (x,y) will
  * move to.  Enter with the monsters coordinates in (x,y).
  * Returns no value.
  */
 static int      tmpitem, xl, xh, yl, yh;
-void
+static void
 movemt(i, j)
 	int             i, j;
+{
 	int    k, m, z, tmp, xtmp, ytmp, monst;
 	switch (monst = mitem[i][j]) {	/* for half speed monsters */
 	case TROGLODYTE:
 	case HOBGOBLIN:
 	case METAMORPH:
 	case XVART:
 	case INVISIBLESTALKER:
 	case ICELIZARD:
 		if ((gltime & 1) == 1)
 			return;
 @@ -259,27 +263,27 @@ out:		if (tmp < distance)	/* did find co
 	if (w1[tmp] < 10000)
 		if ((i != w1x[tmp]) || (j != w1y[tmp]))
 			mmove(i, j, w1x[tmp], w1y[tmp]);
+}
 /*
  * mmove(x,y,xd,yd)	Function to actually perform the monster movement
  * 	int x,y,xd,yd;
+ *
  * Enter with the from coordinates in (x,y) and the destination coordinates
  * in (xd,yd).
  */
-void
+static void
 mmove(aa, bb, cc, dd)
 	int             aa, bb, cc, dd;
+{
 	int    tmp, i, flag;
 	const char *who = NULL, *p;
 	flag = 0;		/* set to 1 if monster hit by arrow trap */
 	if ((cc == playerx) && (dd == playery)) {
 		hitplayer(aa, bb);
 		moved[aa][bb] = 1;
 		return;
+	}
 	i = item[cc][dd];
 @@ -392,27 +396,27 @@ mmove(aa, bb, cc, dd)
 /*
  * movsphere() 	Function to look for and move spheres of annihilation
+ *
  * This function works on the sphere linked list, first duplicating the list
  * (the act of moving changes the list), then processing each sphere in order
  * to move it.  They eat anything in their way, including stairs, volcanic
  * shafts, potions, etc, except for upper level demons, who can dispel
  * spheres.
  * No value is returned.
  */
 #define SPHMAX 20		/* maximum number of spheres movsphere can
 				 * handle */
-void
+static void
 movsphere()
+{
 	int    x, y, dir, len;
 	struct sphere *sp, *sp2;
 	struct sphere   sph[SPHMAX];
 	/* first duplicate sphere list */
 	for (sp = 0, x = 0, sp2 = spheres; sp2; sp2 = sp2->p)	/* look through sphere
 								 * list */
 		if (sp2->lev == level) {	/* only if this level */
 			sph[x] = *sp2;
 			sph[x++].p = 0;	/* copy the struct */
 			if (x > 1)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: io.c,v 1.23 2008/02/03 21:24:58 dholland Exp $	*/
+/*	$NetBSD: io.c,v 1.24 2009/08/12 08:04:05 dholland Exp $	*/
 /*
  * io.c			 Larn is copyrighted 1986 by Noah Morgan.
+ *
  * Below are the functions in this file:
+ *
  * setupvt100() 	Subroutine to set up terminal in correct mode for game
  * clearvt100()  	Subroutine to clean up terminal when the game is over
  * ttgetch() 		Routine to read in one character from the terminal
  * scbr()			Function to set cbreak -echo for the terminal
  * sncbr()			Function to set -cbreak echo for the terminal
  * newgame() 		Subroutine to save the initial time and seed rnd()
+ *
 @@ -52,27 +52,27 @@
  * lear screen from [1,y] to end of display. standout(str)
  * rint the string in standout mode. set_score_output()
  * alled when output should be literally printed. * ttputch(ch)
  * rint one character in decoded output buffer. * flush_buf()
  * lush buffer with decoded output. * init_term()
  * erminal initialization -- setup termcap info *	char *tmcapcnv(sd,ss)
  * outine to convert VT100 \33's to termcap format beep()
  * e to emit a beep if enabled (see no-beep in .larnopts)
+ *
  * Note: ** entries are available only in termcap mode.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: io.c,v 1.23 2008/02/03 21:24:58 dholland Exp $");
+__RCSID("$NetBSD: io.c,v 1.24 2009/08/12 08:04:05 dholland Exp $");
 #endif /* not lint */
 #include "header.h"
 #include "extern.h"
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <termcap.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <ctype.h>
 @@ -640,28 +640,28 @@ void
 cursors()
+{
 	cursor(1, 24);
+}
 #ifndef VT100
 /*
  * Warning: ringing the bell is control code 7. Don't use in defines.
  * Don't change the order of these defines.
  * Also used in helpfiles. Codes used in helpfiles should be \E[1 to \E[7 with
  * obvious meanings.
  */
-struct tinfo   *info;
+static struct tinfo *info;
-char           *CM, *CE, *CD, *CL, *SO, *SE, *AL, *DL;	/* Termcap capabilities */
+static char *CM, *CE, *CD, *CL, *SO, *SE, *AL, *DL;	/* Termcap capabilities */
 static char    *outbuf = 0;	/* translated output buffer */
 /*
  * init_term()		Terminal initialization -- setup termcap info
  */
 void
 init_term()
+{
 	char           *term;
 	switch (t_getent(&info, term = getenv("TERM"))) {
 	case -1:
 		write(2, "Cannot open termcap file.\n", 26);

 @@ -1,30 +1,50 @@
-/*	$NetBSD: main.c,v 1.23 2008/02/03 21:24:58 dholland Exp $	*/
+/*	$NetBSD: main.c,v 1.24 2009/08/12 08:04:05 dholland Exp $	*/
 /* main.c		 */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.23 2008/02/03 21:24:58 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.24 2009/08/12 08:04:05 dholland Exp $");
 #endif				/* not lint */
 #include <sys/types.h>
 #include <stdio.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include "header.h"
 #include "extern.h"
 static void showstr(void);
 static void t_setup(int);
 static void t_endup(int);
 static void showwear(void);
 static void showwield(void);
 static void showread(void);
 static void showeat(void);
 static void showquaff(void);
 static void show1(int, const char *[]);
 static void randmonst(void);
 static void parse(void);
 static void run(int);
 static void wield(void);
 static void ydhi(int);
 static void ycwi(int);
 static void wear(void);
 static void dropobj(void);
 static void readscr(void);
 static void eatcookie(void);
 static void quaff(void);
 static int whatitem(const char *);
 static char     copyright[] = "\nLarn is copyrighted 1986 by Noah Morgan.\n";
 int             srcount = 0;	/* line counter for showstr()	 */
 int             dropflag = 0;	/* if 1 then don't lookforobject() next round */
 int             rmst = 80;	/* random monster creation counter		 */
 int             userid;		/* the players login user id number */
 gid_t           gid, egid;	/* used for security */
 u_char          nowelcome = 0, nomove = 0;	/* if (nomove) then don't
 						 * count next iteration as a
 						 * move */
 static char     viewflag = 0;
 /*
 @@ -299,27 +319,27 @@ main(argc, argv)
 			if (--rmst <= 0) {
 				rmst = 120 - (level << 2);
 				fillmonst(makemonst(level));
+			}
+	}
+}
 /*
 	showstr()
 	show character's inventory
  */
-void
+static void
 showstr()
+{
 	int    i, number;
 	for (number = 3, i = 0; i < 26; i++)
 		if (iven[i])
 			number++;	/* count items in inventory */
 	t_setup(number);
 	qshowstr();
 	t_endup(number);
+}
 void
 qshowstr()
 @@ -338,58 +358,58 @@ qshowstr()
 				for (j = 0; j <= k; j++)
 					if (i == iven[j])
 						show3(j);
 			k = 0;
+		}
 	lprintf("\nElapsed time is %ld.  You have %ld mobuls left", (long) ((gltime + 99) / 100 + 1), (long) ((TIMELIMIT - gltime) / 100));
 	more();
 	nosignal = sigsav;
+}
 /*
  *	subroutine to clear screen depending on # lines to display
  */
-void
+static void
 t_setup(count)
 	int    count;
+{
 	if (count < 20) {	/* how do we clear the screen? */
 		cl_up(79, count);
 		cursor(1, 1);
 	} else {
 		resetscroll();
 		clear();
+	}
+}
 /*
  *	subroutine to restore normal display screen depending on t_setup()
  */
-void
+static void
 t_endup(count)
 	int    count;
+{
 	if (count < 18)		/* how did we clear the screen? */
 		draws(0, MAXX, 0, (count > MAXY) ? MAXY : count);
 	else {
 		drawscreen();
 		setscroll();
+	}
+}
 /*
 	function to show the things player is wearing only
  */
-void
+static void
 showwear()
+{
 	int    i, j, sigsav, count;
 	sigsav = nosignal;
 	nosignal = 1;		/* don't allow ^c etc */
 	srcount = 0;
 	for (count = 2, j = 0; j <= 26; j++)	/* count number of items we
 						 * will display */
 		if ((i = iven[j]) != 0)
 			switch (i) {
 			case OLEATHER:
 			case OPLATE:
 @@ -418,27 +438,27 @@ showwear()
 				case OPLATEARMOR:
 				case OSSPLATE:
 				case OSHIELD:
 					show3(j);
 				};
 	more();
 	nosignal = sigsav;
 	t_endup(count);
+}
 /*
 	function to show the things player can wield only
  */
-void
+static void
 showwield()
+{
 	int    i, j, sigsav, count;
 	sigsav = nosignal;
 	nosignal = 1;		/* don't allow ^c etc */
 	srcount = 0;
 	for (count = 2, j = 0; j <= 26; j++)	/* count how many items */
 		if ((i = iven[j]) != 0)
 			switch (i) {
 			case ODIAMOND:
 			case ORUBY:
 			case OEMERALD:
 @@ -476,27 +496,27 @@ showwield()
 				case OSCROLL:
 					break;
 				default:
 					show3(j);
 				};
 	more();
 	nosignal = sigsav;
 	t_endup(count);
+}
 /*
  *	function to show the things player can read only
  */
-void
+static void
 showread()
+{
 	int    i, j, sigsav, count;
 	sigsav = nosignal;
 	nosignal = 1;		/* don't allow ^c etc */
 	srcount = 0;
 	for (count = 2, j = 0; j <= 26; j++)
 		switch (iven[j]) {
 		case OBOOK:
 		case OSCROLL:
 			count++;
 		};
 @@ -508,27 +528,27 @@ showread()
 				switch (i) {
 				case OBOOK:
 				case OSCROLL:
 					show3(j);
 				};
 	more();
 	nosignal = sigsav;
 	t_endup(count);
+}
 /*
  *	function to show the things player can eat only
  */
-void
+static void
 showeat()
+{
 	int    i, j, sigsav, count;
 	sigsav = nosignal;
 	nosignal = 1;		/* don't allow ^c etc */
 	srcount = 0;
 	for (count = 2, j = 0; j <= 26; j++)
 		switch (iven[j]) {
 		case OCOOKIE:
 			count++;
 		};
 	t_setup(count);
 @@ -538,54 +558,54 @@ showeat()
 			if (i == iven[j])
 				switch (i) {
 				case OCOOKIE:
 					show3(j);
 				};
 	more();
 	nosignal = sigsav;
 	t_endup(count);
+}
 /*
 	function to show the things player can quaff only
  */
-void
+static void
 showquaff()
+{
 	int    i, j, sigsav, count;
 	sigsav = nosignal;
 	nosignal = 1;		/* don't allow ^c etc */
 	srcount = 0;
 	for (count = 2, j = 0; j <= 26; j++)
 		switch (iven[j]) {
 		case OPOTION:
 			count++;
 		};
 	t_setup(count);
 	for (i = 22; i < 84; i++)
 		for (j = 0; j <= 26; j++)
 			if (i == iven[j])
 				switch (i) {
 				case OPOTION:
 					show3(j);
 				};
 	more();
 	nosignal = sigsav;
 	t_endup(count);
+}
-void
+static void
 show1(idx, str2)
 	int    idx;
 	const char  *str2[];
+{
 	lprintf("\n%c)   %s", idx + 'a', objectname[iven[idx]]);
 	if (str2 != 0 && str2[ivenarg[idx]][0] != 0)
 		lprintf(" of%s", str2[ivenarg[idx]]);
+}
 void
 show3(int indx)
+{
 	switch (iven[indx]) {
 @@ -622,45 +642,45 @@ show3(int indx)
 		lprcat(" (weapon in hand)");
 	if ((c[WEAR] == indx) || (c[SHIELD] == indx))
 		lprcat(" (being worn)");
 	if (++srcount >= 22) {
 		srcount = 0;
 		more();
 		clear();
+	}
+}
 /*
 	subroutine to randomly create monsters if needed
  */
-void
+static void
 randmonst()
+{
 	if (c[TIMESTOP])
 		return;		/* don't make monsters if time is stopped	 */
 	if (--rmst <= 0) {
 		rmst = 120 - (level << 2);
 		fillmonst(makemonst(level));
+	}
+}
 /*
 	parse()
 	get and execute a command
  */
-void
+static void
 parse()
+{
 	int    i, j, k, flag;
 	while (1) {
 		k = yylex();
 		switch (k) {	/* get the token from the input and switch on
 				 * it	 */
 		case 'h':
 			moveplayer(4);
 			return;	/* west		 */
 		case 'H':
 			run(4);
 			return;	/* west		 */
 @@ -959,52 +979,52 @@ parse()
+	}
+}
 void
 parse2()
+{
 	if (c[HASTEMONST])
 		movemonst();
 	movemonst();		/* move the monsters		 */
 	randmonst();
 	regen();
+}
-void
+static void
 run(dir)
 	int             dir;
+{
 	int    i;
 	i = 1;
 	while (i) {
 		i = moveplayer(dir);
 		if (i > 0) {
 			if (c[HASTEMONST])
 				movemonst();
 			movemonst();
 			randmonst();
 			regen();
+		}
 		if (hitflag)
 			i = 0;
 		if (i != 0)
 			showcell(playerx, playery);
+	}
+}
 /*
 	function to wield a weapon
  */
-void
+static void
 wield()
+{
 	int    i;
 	while (1) {
 		if ((i = whatitem("wield")) == '\33')
 			return;
 		if (i != '.') {
 			if (i == '*')
 				showwield();
 			else if (iven[i - 'a'] == 0) {
 				ydhi(i);
 				return;
 			} else if (iven[i - 'a'] == OPOTION) {
 @@ -1022,45 +1042,45 @@ wield()
 					c[LANCEDEATH] = 1;
 				else
 					c[LANCEDEATH] = 0;
 				bottomline();
 				return;
+			}
+		}
+	}
+}
 /*
 	common routine to say you don't have an item
  */
-void
+static void
 ydhi(x)
 	int             x;
+{
 	cursors();
 	lprintf("\nYou don't have item %c!", x);
+}
-void
+static void
 ycwi(x)
 	int             x;
+{
 	cursors();
 	lprintf("\nYou can't wield item %c!", x);
+}
 /*
 	function to wear armor
  */
-void
+static void
 wear()
+{
 	int    i;
 	while (1) {
 		if ((i = whatitem("wear")) == '\33')
 			return;
 		if (i != '.') {
 			if (i == '*')
 				showwear();
 			else
 				switch (iven[i - 'a']) {
 				case 0:
 					ydhi(i);
 @@ -1092,27 +1112,27 @@ wear()
 					c[SHIELD] = i - 'a';
 					bottomline();
 					return;
 				default:
 					lprcat("\nYou can't wear that!");
 				};
+		}
+	}
+}
 /*
 	function to drop an object
  */
-void
+static void
 dropobj()
+{
 	int    i;
 	unsigned char  *p;
 	long            amt;
 	p = &item[playerx][playery];
 	while (1) {
 		if ((i = whatitem("drop")) == '\33')
 			return;
 		if (i == '*')
 			showstr();
 		else {
 			if (i == '.') {	/* drop some gold */
 @@ -1156,27 +1176,27 @@ dropobj()
 				know[playerx][playery] = 0;
 				dropflag = 1;
 				return;
+			}
 			drop_object(i - 'a');
 			return;
+		}
+	}
+}
 /*
  *	readscr()		Subroutine to read a scroll one is carrying
  */
-void
+static void
 readscr()
+{
 	int    i;
 	while (1) {
 		if ((i = whatitem("read")) == '\33')
 			return;
 		if (i != '.') {
 			if (i == '*')
 				showread();
 			else {
 				if (iven[i - 'a'] == OSCROLL) {
 					read_scroll(ivenarg[i - 'a']);
 					iven[i - 'a'] = 0;
 @@ -1191,27 +1211,27 @@ readscr()
 					ydhi(i);
 					return;
+				}
 				lprcat("\nThere's nothing on it to read");
 				return;
+			}
+		}
+	}
+}
 /*
  *	subroutine to eat a cookie one is carrying
  */
-void
+static void
 eatcookie(void)
+{
 	const char *p;
 	int i;
 	while (1) {
 		if ((i = whatitem("eat")) == '\33')
 			return;
 		if (i != '.') {
 			if (i == '*')
 				showeat();
 			else {
 				if (iven[i - 'a'] == OCOOKIE) {
 @@ -1229,27 +1249,27 @@ eatcookie(void)
 					ydhi(i);
 					return;
+				}
 				lprcat("\nYou can't eat that!");
 				return;
+			}
+		}
+	}
+}
 /*
  *	subroutine to quaff a potion one is carrying
  */
-void
+static void
 quaff()
+{
 	int    i;
 	while (1) {
 		if ((i = whatitem("quaff")) == '\33')
 			return;
 		if (i != '.') {
 			if (i == '*')
 				showquaff();
 			else {
 				if (iven[i - 'a'] == OPOTION) {
 					quaffpotion(ivenarg[i - 'a']);
 					iven[i - 'a'] = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: monster.c,v 1.16 2008/02/03 21:24:58 dholland Exp $	*/
+/*	$NetBSD: monster.c,v 1.17 2009/08/12 08:04:05 dholland Exp $	*/
 /*
  * monster.c	Larn is copyrighted 1986 by Noah Morgan.
+ *
  * This file contains the following functions:
  * ----------------------------------------------------------------------------
+ *
  * createmonster(monstno) 	Function to create a monster next to the player
  * int monstno;
+ *
  * int cgood(x,y,itm,monst)Function to check location for emptiness
  * int x,y,itm,monst;
+ *
 @@ -90,45 +90,58 @@
  * int x,y,dir,lifetime;
+ *
  * rmsphere(x,y)	Function to delete a sphere of annihilation from list
  * int x,y;
+ *
  * sphboom(x,y)	Function to perform the effects of a sphere detonation
  * int x,y;
+ *
  * genmonst()		Function to ask for monster and genocide from game
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: monster.c,v 1.16 2008/02/03 21:24:58 dholland Exp $");
+__RCSID("$NetBSD: monster.c,v 1.17 2009/08/12 08:04:05 dholland Exp $");
 #endif				/* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include "header.h"
 #include "extern.h"
 struct isave {			/* used for altar reality */
 	char            type;	/* 0=item,  1=monster */
 	char            id;	/* item number or monster number */
 	short           arg;	/* the type of item or hitpoints of monster */
 };
 static int cgood(int, int, int, int);
 static void speldamage(int);
 static void loseint(void);
 static int isconfuse(void);
 static int nospell(int, int);
 static int fullhit(int);
 static void direct(int, int, const char *, int);
 static void ifblind(int, int);
 static void tdirect(int);
 static void omnidirect(int, int, const char *);
 static int dirsub(int *, int *);
 static void dirpoly(int);
 static int hitm(int, int, int);
 static void dropsomething(int);
 static int spattack(int, int, int);
 static void sphboom(int, int);
 static void genmonst(void);
 /*
  * createmonster(monstno)	Function to create a monster next to the player
  * 	int monstno;
+ *
  * Enter with the monster number (1 to MAXMONST+8)
  * Returns no value.
  */
 void
 createmonster(mon)
 	int             mon;
+{
 	int    x, y, k, i;
 @@ -264,27 +277,27 @@ over:		lprcat(aborted);
+			}
 	if (j == -1)
 		lprcat("  Nothing Happened ");
 	bottomline();
+}
 /*
  * speldamage(x) 		Function to perform spell functions cast by the player
  * 	int x;
+ *
  * Enter with the spell number, returns no value.
  * Please insure that there are 2 spaces before all messages here
  */
-void
+static void
 speldamage(int x)
+{
 	int    i, j, clev;
 	int             xl, xh, yl, yh;
 	u_char  *p, *kn, *pm;
 	if (x >= SPNUM)
 		return;		/* no such spell */
 	if (c[TIMESTOP]) {
 		lprcat("  It didn't seem to work");
 		return;
 	}			/* not if time stopped */
 	clev = c[LEVEL];
 @@ -629,103 +642,103 @@ speldamage(int x)
 	default:
 		lprintf("  spell %ld not available!", (long) x);
 		beep();
 		return;
 	};
+}
 /*
  * loseint()		Routine to subtract 1 from your int (intelligence) if > 3
+ *
  * No arguments and no return value
  */
-void
+static void
 loseint()
+{
 	if (--c[INTELLIGENCE] < 3)
 		c[INTELLIGENCE] = 3;
+}
 /*
  * isconfuse() 		Routine to check to see if player is confused
+ *
  * This routine prints out a message saying "You can't aim your magic!"
  * returns 0 if not confused, non-zero (time remaining confused) if confused
  */
-int
+static int
 isconfuse()
+{
 	if (c[CONFUSE]) {
 		lprcat(" You can't aim your magic!");
 		beep();
+	}
 	return (c[CONFUSE]);
+}
 /*
  * nospell(x,monst)	Routine to return 1 if a spell doesn't affect a monster
  * 	int x,monst;
+ *
  * Subroutine to return 1 if the spell can't affect the monster
  *   otherwise returns 0
  * Enter with the spell number in x, and the monster number in monst.
  */
-int
+static int
 nospell(x, monst)
 	int             x, monst;
+{
 	int    tmp;
 	if (x >= SPNUM || monst >= MAXMONST + 8 || monst < 0 || x < 0)
 		return (0);	/* bad spell or monst */
 	if ((tmp = spelweird[monst - 1][x]) == 0)
 		return (0);
 	cursors();
 	lprc('\n');
 	lprintf(spelmes[tmp], monster[monst].name);
 	return (1);
+}
 /*
  * fullhit(xx)		Function to return full damage against a monster (aka web)
  * 	int xx;
+ *
  * Function to return hp damage to monster due to a number of full hits
  * Enter with the number of full hits being done
  */
-int
+static int
 fullhit(xx)
 	int             xx;
+{
 	int    i;
 	if (xx < 0 || xx > 20)
 		return (0);	/* fullhits are out of range */
 	if (c[LANCEDEATH])
 		return (10000);	/* lance of death */
 	i = xx * ((c[WCLASS] >> 1) + c[STRENGTH] + c[STREXTRA] - c[HARDGAME] - 12 + c[MOREDAM]);
 	return ((i >= 1) ? i : xx);
+}
 /*
  * direct(spnum,dam,str,arg)	Routine to direct spell damage 1 square in 1 dir
  * 	int spnum,dam,arg;
  * 	char *str;
+ *
  * Routine to ask for a direction to a spell and then hit the monster
  * Enter with the spell number in spnum, the damage to be done in dam,
  *   lprintf format string in str, and lprintf's argument in arg.
  * Returns no value.
  */
-void
+static void
 direct(spnum, dam, str, arg)
 	int             spnum, dam, arg;
 	const char     *str;
+{
 	int             x, y;
 	int    m;
 	if (spnum < 0 || spnum >= SPNUM || str == 0)
 		return;		/* bad arguments */
 	if (isconfuse())
 		return;
 	dirsub(&x, &y);
 	m = mitem[x][y];
 	if (item[x][y] == OMIRROR) {
 @@ -891,51 +904,51 @@ godirect(spnum, dam, str, delay, cshow)
 			};
 		dam -= 3 + (c[HARDGAME] >> 1);
+	}
+}
 /*
  * ifblind(x,y)	Routine to put "monster" or the monster name into lastmosnt
  * 	int x,y;
+ *
  * Subroutine to copy the word "monster" into lastmonst if the player is blind
  * Enter with the coordinates (x,y) of the monster
  * Returns no value.
  */
-void
+static void
 ifblind(int x, int y)
+{
 	const char *p;
 	vxy(&x, &y);		/* verify correct x,y coordinates */
 	if (c[BLINDCOUNT]) {
 		lastnum = 279;
 		p = "monster";
 	} else {
 		lastnum = mitem[x][y];
 		p = monster[lastnum].name;
+	}
 	strcpy(lastmonst, p);
+}
 /*
  * tdirect(spnum)		Routine to teleport away a monster
  * 	int spnum;
+ *
  * Routine to ask for a direction to a spell and then teleport away monster
  * Enter with the spell number that wants to teleport away
  * Returns no value.
  */
-void
+static void
 tdirect(spnum)
 	int             spnum;
+{
 	int             x, y;
 	int    m;
 	if (spnum < 0 || spnum >= SPNUM)
 		return;		/* bad args */
 	if (isconfuse())
 		return;
 	dirsub(&x, &y);
 	if ((m = mitem[x][y]) == 0) {
 		lprcat("  There wasn't anything there!");
 		return;
 @@ -950,27 +963,27 @@ tdirect(spnum)
 	mitem[x][y] = know[x][y] = 0;
+}
 /*
  * omnidirect(sp,dam,str)   Routine to damage all monsters 1 square from player
  * 	int sp,dam;
  * 	char *str;
+ *
  * Routine to cast a spell and then hit the monster in all directions
  * Enter with the spell number in sp, the damage done to wach square in dam,
  *   and the lprintf string to identify the spell in str.
  * Returns no value.
  */
-void
+static void
 omnidirect(int spnum, int dam, const char *str)
+{
 	int    x, y, m;
 	if (spnum < 0 || spnum >= SPNUM || str == 0)
 		return;		/* bad args */
 	for (x = playerx - 1; x < playerx + 2; x++)
 		for (y = playery - 1; y < playery + 2; y++) {
 			if ((m = mitem[x][y]) != 0) {
 				if (nospell(spnum, m) == 0) {
 					ifblind(x, y);
 					cursors();
 					lprc('\n');
 @@ -1058,27 +1071,27 @@ vxy(x, y)
 		flag++;
+	}
 	return (flag);
+}
 /*
  * dirpoly(spnum)	Routine to ask for a direction and polymorph a monst
  * 	int spnum;
+ *
  * Subroutine to polymorph a monster and ask for the direction its in
  * Enter with the spell number in spmun.
  * Returns no value.
  */
-void
+static void
 dirpoly(spnum)
 	int             spnum;
+{
 	int             x, y, m;
 	if (spnum < 0 || spnum >= SPNUM)
 		return;		/* bad args */
 	if (isconfuse())
 		return;		/* if he is confused, he can't aim his magic */
 	dirsub(&x, &y);
 	if (mitem[x][y] == 0) {
 		lprcat("  There wasn't anything there!");
 		return;
+	}
 @@ -1144,27 +1157,27 @@ hitmonster(x, y)
 			mitem[x][y] = BAT;
 			know[x][y] = 0;
+		}
+}
 /*
  * hitm(x,y,amt)	Function to just hit a monster at a given coordinates
  * 	int x,y,amt;
+ *
  * Returns the number of hitpoints the monster absorbed
  * This routine is used to specifically damage a monster at a location (x,y)
  * Called by hitmonster(x,y)
  */
-int
+static int
 hitm(x, y, amt)
 	int x, y;
 	int amt;
+{
 	int    monst;
 	int    hpoints, amt2;
 	vxy(&x, &y);		/* verify coordinates are within range */
 	amt2 = amt;		/* save initial damage so we can return it */
 	monst = mitem[x][y];
 	if (c[HALFDAM])
 		amt >>= 1;	/* if half damage curse adjust damage points */
 	if (amt <= 0)
 		amt2 = amt = 1;
 @@ -1857,27 +1870,27 @@ rmsphere(x, y)
 					free((char *) sp);
+				}
 				break;
+			}
 	return (c[SPHCAST]);	/* return number of spheres in the world */
+}
 /*
  * sphboom(x,y)	Function to perform the effects of a sphere detonation
  * 	int x,y;
+ *
  * Enter with the coordinates of the blast, Returns no value
  */
-void
+static void
 sphboom(x, y)
 	int             x, y;
+{
 	int    i, j;
 	if (c[HOLDMONST])
 		c[HOLDMONST] = 1;
 	if (c[CANCELLATION])
 		c[CANCELLATION] = 1;
 	for (j = max(1, x - 2); j < min(x + 3, MAXX - 1); j++)
 		for (i = max(1, y - 2); i < min(y + 3, MAXY - 1); i++) {
 			item[j][i] = mitem[j][i] = 0;
 			show1cell(j, i);
 			if (playerx == j && playery == i) {
 @@ -1885,27 +1898,27 @@ sphboom(x, y)
 				beep();
 				lprcat("\nYou were too close to the sphere!");
 				nap(3000);
 				died(283);	/* player killed in explosion */
+			}
+		}
+}
 /*
  * genmonst()		Function to ask for monster and genocide from game
+ *
  * This is done by setting a flag in the monster[] structure
  */
-void
+static void
 genmonst()
+{
 	int    i, j;
 	cursors();
 	lprcat("\nGenocide what monster? ");
 	for (i = 0; (!isalpha(i)) && (i != ' '); i = ttgetch());
 	lprc(i);
 	for (j = 0; j < MAXMONST; j++)	/* search for the monster type */
 		if (monstnamelist[j] == i) {	/* have we found it? */
 			monster[j].genocided = 1;	/* genocided from game */
 			lprintf("  There will be no more %s's", monster[j].name);
 			/* now wipe out monsters on this level */
 			newcavelevel(level);

 @@ -1,24 +1,39 @@
-/*	$NetBSD: object.c,v 1.14 2008/02/04 01:07:01 dholland Exp $	*/
+/*	$NetBSD: object.c,v 1.15 2009/08/12 08:04:05 dholland Exp $	*/
 /* object.c		Larn is copyrighted 1986 by Noah Morgan. */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: object.c,v 1.14 2008/02/04 01:07:01 dholland Exp $");
+__RCSID("$NetBSD: object.c,v 1.15 2009/08/12 08:04:05 dholland Exp $");
 #endif				/* not lint */
 #include "header.h"
 #include "extern.h"
 static void finditem(int);
 static void ostairs(int);
 static void opotion(int);
 static void oscroll(int);
 static void oorb(void);
 static void opit(void);
 static void obottomless(void);
 static void oelevator(int);
 static void ostatue(void);
 static void omirror(void);
 static void obook(void);
 static void ocookie(void);
 static void ogold(int);
 static void ohome(void);
 /*
 	lookforobject
 	subroutine to look for an object and give the player his options
 	if an object was found.
  */
 void
 lookforobject()
+{
 	int    i, j;
 	if (c[TIMESTOP])
 		return;		/* can't find objects if time is stopped	 */
 	i = item[playerx][playery];
 @@ -485,27 +500,27 @@ lookforobject()
 		else
 			lprcat(" stay here");
 		break;
 	default:
 		finditem(i);
 		break;
 	};
+}
 /*
 	function to say what object we found and ask if player wants to take it
  */
-void
+static void
 finditem(int theitem)
+{
 	int             tmp, i;
 	lprintf("\n\nYou have found %s ", objectname[theitem]);
 	tmp = iarg[playerx][playery];
 	switch (theitem) {
 	case ODIAMOND:
 	case ORUBY:
 	case OEMERALD:
 	case OSAPPHIRE:
 	case OSPIRITSCARAB:
 	case OORBOFDRAGON:
 	case OCUBEofUNDEAD:
 @@ -528,27 +543,27 @@ finditem(int theitem)
 		if (take(theitem, tmp) == 0)
 			forget();
 		return;
+	}
 	ignore();
+}
 /*
 	subroutine to process the stair cases
 	if dir > 0 the up else down
  */
-void
+static void
 ostairs(dir)
 	int             dir;
+{
 	int    k;
 	lprcat("\nDo you (s) stay here  ");
 	if (dir > 0)
 		lprcat("(u) go up  ");
 	else
 		lprcat("(d) go down  ");
 	lprcat("or (f) kick stairs? ");
 	while (1)
 		switch (ttgetch()) {
 @@ -631,27 +646,27 @@ oteleport(err)
 	playerx = rnd(MAXX - 2);
 	playery = rnd(MAXY - 2);
 	if (level != tmp)
 		newcavelevel(tmp);
 	positionplayer();
 	draws(0, MAXX, 0, MAXY);
 	bot_linex();
+}
 /*
 	function to process a potion
  */
-void
+static void
 opotion(pot)
 	int             pot;
+{
 	lprcat("\nDo you (d) drink it, (t) take it");
 	iopts();
 	while (1)
 		switch (ttgetch()) {
 		case '\33':
 		case 'i':
 			ignore();
 			return;
 		case 'd':
 @@ -840,27 +855,27 @@ quaffpotion(pot)
 		lprcat("\nYou feel your vision sharpen");	/* see invisible */
 		c[SEEINVISIBLE] += rnd(1000) + 400;
 		monstnamelist[INVISIBLESTALKER] = 'I';
 		return;
 	};
 	bottomline();		/* show new stats		 */
 	return;
+}
 /*
 	function to process a magic scroll
  */
-void
+static void
 oscroll(typ)
 	int             typ;
+{
 	lprcat("\nDo you ");
 	if (c[BLINDCOUNT] == 0)
 		lprcat("(r) read it, ");
 	lprcat("(t) take it");
 	iopts();
 	while (1)
 		switch (ttgetch()) {
 		case '\33':
 		case 'i':
 			ignore();
 @@ -890,27 +905,27 @@ oscroll(typ)
 	data for the function to read a scroll
  */
 static int      xh, yh, yl, xl;
 static u_char     curse[] = {
 	BLINDCOUNT, CONFUSE, AGGRAVATE, HASTEMONST, ITCHING,
 	LAUGHING, DRAINSTRENGTH, CLUMSINESS, INFEEBLEMENT, HALFDAM
 };
 static u_char     exten[] = {
 	PROTECTIONTIME, DEXCOUNT, STRCOUNT, CHARMCOUNT, INVISIBILITY,
 	CANCELLATION, HASTESELF, GLOBE, SCAREMONST, HOLDMONST, TIMESTOP
 };
-u_char time_change[] = {
+static u_char time_change[] = {
 	HASTESELF, HERO, ALTPRO, PROTECTIONTIME, DEXCOUNT, STRCOUNT,
 	GIANTSTR, CHARMCOUNT, INVISIBILITY, CANCELLATION, HASTESELF,
 	AGGRAVATE, SCAREMONST, STEALTH, AWARENESS, HOLDMONST,
 	HASTEMONST, FIRERESISTANCE, GLOBE, SPIRITPRO, UNDEADPRO,
 	HALFDAM, SEEINVISIBLE, ITCHING, CLUMSINESS, WTW
 };
 /*
  *	function to adjust time when time warping and taking courses in school
  */
 void
 adjusttime(tim)
 	long   tim;
 @@ -1072,32 +1087,32 @@ read_scroll(typ)
 		break;		/* scroll of annihilation */
 	case 22:
 		godirect(22, 150, "The ray hits the %s", 0, ' ');	/* pulverization */
 		break;
 	case 23:
 		c[LIFEPROT]++;
 		break;		/* life protection */
 	};
+}
-void
+static void
 oorb()
+{
+}
-void
+static void
 opit()
+{
 	int    i;
 	if (rnd(101) < 81) {
 		if (rnd(70) > 9 * c[DEXTERITY] - packweight() || rnd(101) < 5) {
 			if (level == MAXLEVEL - 1)
 				obottomless();
 			else if (level == MAXLEVEL + MAXVLEVEL - 1)
 				obottomless();
 			else {
 				if (rnd(101) < 20) {
 					i = 0;
 					lprcat("\nYou fell into a pit!  Your fall is cushioned by an unknown force\n");
 @@ -1106,56 +1121,57 @@ opit()
 					lprintf("\nYou fell into a pit!  You suffer %ld hit points damage", (long) i);
 					lastnum = 261;	/* if he dies scoreboard
 							 * will say so */
+				}
 				losehp(i);
 				nap(2000);
 				newcavelevel(level + 1);
 				draws(0, MAXX, 0, MAXY);
+			}
+		}
+	}
+}
-void
+static void
 obottomless()
+{
 	lprcat("\nYou fell into a bottomless pit!");
 	beep();
 	nap(3000);
 	died(262);
+}
 void
 static void
 oelevator(dir)
 	int             dir;
+{
 #ifdef lint
 	int             x;
 	x = dir;
 	dir = x;
 #endif	/* lint */
+}
-void
+static void
 ostatue()
+{
+}
-void
+static void
 omirror()
+{
+}
-void
+static void
 obook()
+{
 	lprcat("\nDo you ");
 	if (c[BLINDCOUNT] == 0)
 		lprcat("(r) read it, ");
 	lprcat("(t) take it");
 	iopts();
 	while (1)
 		switch (ttgetch()) {
 		case '\33':
 		case 'i':
 			ignore();
 			return;
 @@ -1187,27 +1203,27 @@ readbook(lev)
 	if (lev <= 3)
 		i = rund((tmp = splev[lev]) ? tmp : 1);
 	else
 		i = rnd((tmp = splev[lev] - 9) ? tmp : 1) + 9;
 	spelknow[i] = 1;
 	lprintf("\nSpell \"%s\":  %s\n%s", spelcode[i], spelname[i], speldescript[i]);
 	if (rnd(10) == 4) {
 		lprcat("\nYour int went up by one!");
 		c[INTELLIGENCE]++;
 		bottomline();
+	}
+}
-void
+static void
 ocookie(void)
+{
 	const char *p;
 	lprcat("\nDo you (e) eat it, (t) take it");
 	iopts();
 	while (1)
 		switch (ttgetch()) {
 		case '\33':
 		case 'i':
 			ignore();
 			return;
 @@ -1225,45 +1241,45 @@ ocookie(void)
 		case 't':
 			lprcat("take");
 			if (take(OCOOKIE, 0) == 0)
 				forget();	/* no more book	 */
 			return;
 		};
+}
 /*
  * routine to pick up some gold -- if arg==OMAXGOLD then the pile is worth
  * 100* the argument
  */
-void
+static void
 ogold(arg)
 	int             arg;
+{
 	long   i;
 	i = iarg[playerx][playery];
 	if (arg == OMAXGOLD)
 		i *= 100;
 	else if (arg == OKGOLD)
 		i *= 1000;
 	else if (arg == ODGOLD)
 		i *= 10;
 	lprintf("\nIt is worth %ld!", (long) i);
 	c[GOLD] += i;
 	bottomgold();
 	item[playerx][playery] = know[playerx][playery] = 0;	/* destroy gold	 */
+}
-void
+static void
 ohome()
+{
 	int    i;
 	nosignal = 1;		/* disable signals */
 	for (i = 0; i < 26; i++)
 		if (iven[i] == OPOTION)
 			if (ivenarg[i] == 21) {
 				iven[i] = 0;	/* remove the potion of cure
 						 * dianthroritis from
 						 * inventory */
 				clear();
 				lprcat("Congratulations.  You found a potion of cure dianthroritis.\n");
 				lprcat("\nFrankly, No one thought you could do it.  Boy!  Did you surprise them!\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: store.c,v 1.14 2008/02/03 21:24:59 dholland Exp $	 */
+/*	$NetBSD: store.c,v 1.15 2009/08/12 08:04:05 dholland Exp $	 */
 /*-
  * Copyright (c) 1988 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.
 @@ -24,40 +24,42 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char     sccsid[] = "@(#)store.c	5.4 (Berkeley) 5/13/91";
 #else
-__RCSID("$NetBSD: store.c,v 1.14 2008/02/03 21:24:59 dholland Exp $");
+__RCSID("$NetBSD: store.c,v 1.15 2009/08/12 08:04:05 dholland Exp $");
 #endif
 #endif				/* not lint */
 /* store.c		Larn is copyrighted 1986 by Noah Morgan. */
 #include "header.h"
 #include "extern.h"
 static void handsfull(void);
 static void outofstock(void);
 static void nogold(void);
 static void dnditem(int);
 static void banktitle(const char *);
 static void obanksub(void);
 static void otradhead(void);
 static void cnsitm(void);
 static int      dndcount = 0, dnditm = 0;
 /* number of items in the dnd inventory table	 */
 #define MAXITM 83
 /* this is the data for the stuff in the dnd store	 */
 struct _itm     itm[90] = {
 	/*
 	 * cost 		iven name		iven arg   how gp
 	 * iven[]		ivenarg[]  many
 	 */
 @@ -179,36 +181,36 @@ struct _itm     itm[90] = {
 	{500, OSCROLL, 16, 2},
 	{1000, OSCROLL, 17, 1},
 	{500, OSCROLL, 18, 1},
 	{340, OSCROLL, 19, 2},
 	{220, OSCROLL, 20, 3},
 	{3900, OSCROLL, 21, 0},
 	{610, OSCROLL, 22, 1},
 	{3000, OSCROLL, 23, 0}
 };
 /*
 	function for the dnd store
  */
-void
+static void
-dnd_2hed()
+dnd_2hed(void)
+{
 	lprcat("Welcome to the Larn Thrift Shoppe.  We stock many items explorers find useful\n");
 	lprcat(" in their adventures.  Feel free to browse to your hearts content.\n");
 	lprcat("Also be advised, if you break 'em, you pay for 'em.");
+}
-void
+static void
-dnd_hed()
+dnd_hed(void)
+{
 	int    i;
 	for (i = dnditm; i < 26 + dnditm; i++)
 		dnditem(i);
 	cursor(50, 18);
 	lprcat("You have ");
+}
 static void
 handsfull()
+{
 	lprcat("\nYou can't carry anything more!");
 	lflush();
 @@ -336,32 +338,32 @@ dnditem(i)
 		lprintf("scroll of%s", scrollhide[itm[i].arg]);
 	} else
 		lprintf("%s", objectname[itm[i].obj]);
 	cursor(j + 31, k);
 	lprintf("%6ld", (long) (itm[i].price * 10));
+}
 /*
 	for the college of larn
  */
 u_char          course[26] = {0};	/* the list of courses taken	 */
-char            coursetime[] = {10, 15, 10, 20, 10, 10, 10, 5};
+static char coursetime[] = {10, 15, 10, 20, 10, 10, 10, 5};
 /*
 	function to display the header info for the school
  */
-void
+static void
-sch_hed()
+sch_hed(void)
+{
 	clear();
 	lprcat("The College of Larn offers the exciting opportunity of higher education to\n");
 	lprcat("all inhabitants of the caves.  Here is a list of the class schedule:\n\n\n");
 	lprcat("\t\t    Course Name \t       Time Needed\n\n");
 	if (course[0] == 0)
 		lprcat("\t\ta)  Fighters Training I         10 mobuls");	/* line 7 of crt */
 	lprc('\n');
 	if (course[1] == 0)
 		lprcat("\t\tb)  Fighters Training II        15 mobuls");
 	lprc('\n');
 	if (course[2] == 0)
 @@ -689,32 +691,32 @@ obanksub()
+			}
 			break;
 		case '\33':
 			return;
 		};
 		cursor(40, 17);
 		lprintf("%8ld", (long) c[BANKACCOUNT]);
 		cursor(49, 18);
 		lprintf("%8ld", (long) c[GOLD]);
+	}
+}
 #if 0 /* XXX: apparently unused */
 /*
 	subroutine to appraise any stone for the bank
  */
-void
+static void
-appraise(gemstone)
+appraise(int gemstone)
 	int    gemstone;
+{
 	int    j, amt;
 	for (j = 0; j < 26; j++)
 		if (iven[j] == gemstone) {
 			lprintf("\nI see you have %s", objectname[gemstone]);
 			if (gemstone == OLARNEYE)
 				lprcat("  I must commend you.  I didn't think\nyou could get it.");
 			lprcat("  Shall I appraise it for you? ");
 			yrepcount = 0;
 			if (getyn() == 'y') {
 				lprcat("yes.\n  Just one moment please \n");
 				nap(1000);
 				if (gemstone == OLARNEYE) {
 @@ -728,26 +730,28 @@ appraise(gemstone)
 				yrepcount = 0;
 				if (getyn() == 'y') {
 					lprcat("yes\n");
 					c[GOLD] += amt;
 					iven[j] = 0;
 				} else
 					lprcat("no thank you.\n");
 				if (gemstone == OLARNEYE)
 					lprcat("It is, of course, your privilege to keep the stone\n");
 			} else
 				lprcat("no\nO. K.\n");
+		}
+}
 #endif /* 0 - unused */
 /*
 	function for the trading post
  */
 static void
 otradhead()
+{
 	clear();
 	lprcat("Welcome to the Larn Trading Post.  We buy items that explorers no longer find\n");
 	lprcat("useful.  Since the condition of the items you bring in is not certain,\n");
 	lprcat("and we incur great expense in reconditioning the items, we usually pay\n");
 	lprcat("only 20% of their value were they to be new.  If the items are badly\n");
 	lprcat("damaged, we will pay only 10% of their new value.\n\n");
+}
 @@ -829,28 +833,28 @@ otradepost()
 							iven[isub] = 0;
 						} else
 							lprcat("no thanks.\n");
 						j = MAXITM + 100;	/* get out of the inner
 									 * loop */
+					}
 				if (j <= MAXITM + 2)
 					lprcat("\nSo sorry, but we are not authorized to accept that item.");
+			}
+		}
+	}
+}
-void
+static void
-cnsitm()
+cnsitm(void)
+{
 	lprcat("\nSorry, we can't accept unidentified objects.");
+}
 /*
  *	for the Larn Revenue Service
  */
 void
 olrs()
+{
 	int    i, first;
 	long   amt;
 	first = nosignal = 1;	/* disable signals */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scores.c,v 1.17 2008/02/03 20:41:53 dholland Exp $	*/
+/*	$NetBSD: scores.c,v 1.18 2009/08/12 08:04:05 dholland Exp $	*/
 /*
  * scores.c			 Larn is copyrighted 1986 by Noah Morgan.
+ *
  * Functions in this file are:
+ *
  * readboard() 	Function to read in the scoreboard into a static buffer
  * writeboard()	Function to write the scoreboard from readboard()'s buffer
  * makeboard() 	Function to create a new scoreboard (wipe out old one)
  * hashewon()	 Function to return 1 if player has won a game before, else 0
  * long paytaxes(x)	 Function to pay taxes if any are due winshou()
  * ubroutine to print out the winning scoreboard shou(x)
  * ubroutine to print out the non-winners scoreboard showscores()
 @@ -16,27 +16,27 @@
  * Function to show scores and the iven lists that go with them sortboard()
  * unction to sort the scoreboard newscore(score, whoo, whyded, winner)
  * Function to add entry to scoreboard new1sub(score,i,whoo,taxes)
  * Subroutine to put player into a new2sub(score,i,whoo,whyded)
  * Subroutine to put player into a died(x) 	Subroutine to record who
  * played larn, and what the score was diedsub(x) Subroutine to print out a
  * line showing player when he is killed diedlog() 	Subroutine to read a
  * log file and print it out in ascii format getplid(name)
  * on to get players id # from id file
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: scores.c,v 1.17 2008/02/03 20:41:53 dholland Exp $");
+__RCSID("$NetBSD: scores.c,v 1.18 2009/08/12 08:04:05 dholland Exp $");
 #endif				/* not lint */
 #include <sys/types.h>
 #include <sys/times.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include "header.h"
 #include "extern.h"
 struct scofmt {			/* This is the structure for the scoreboard 		 */
 	long            score;	/* the score of the player 							 */
 @@ -92,59 +92,69 @@ static const char *whydead[] = {
 	"a winner", "trapped in solid rock", "killed by a missing save file",
 	"killed by an old save file", "caught by the greedy cheater checker trap",
 	"killed by a protected save file", "killed his family and committed suicide",
 	"erased by a wayward finger", "fell through a bottomless trap door",
 	"fell through a trap door", "drank some poisonous water",
 	"fried by an electric shock", "slipped on a volcano shaft",
 	"killed by a stupid act of frustration", "attacked by a revolting demon",
 	"hit by his own magic", "demolished by an unseen attacker",
 	"fell into the dreadful sleep", "killed by an exploding chest",
 	 /* 26 */ "killed by a missing maze data file", "annihilated in a sphere",
 	"died a post mortem death", "wasted by a malloc() failure"
 };
 static int readboard(void);
 static int writeboard(void);
 static int winshou(void);
 static int shou(int);
 static int sortboard(void);
 static void newscore(long, char *, int, int);
 static void new1sub(long, int, char *, long);
 static void new2sub(long, int, char *, int);
 static void diedsub(int);
 /*
  * readboard() 	Function to read in the scoreboard into a static buffer
+ *
  * returns -1 if unable to read in the scoreboard, returns 0 if all is OK
  */
-int
+static int
 readboard()
+{
 	int             i;
 	if (gid != egid)
 		setegid(egid);
 	i = lopen(scorefile);
 	if (gid != egid)
 		setegid(gid);
 	if (i < 0) {
 		lprcat("Can't read scoreboard\n");
 		lflush();
 		return (-1);
+	}
 	lrfill((char *) sco, sizeof(sco));
 	lrfill((char *) winr, sizeof(winr));
 	lrclose();
 	lcreat((char *) 0);
 	return (0);
+}
 /*
  * writeboard()	Function to write the scoreboard from readboard()'s buffer
+ *
  * returns -1 if unable to write the scoreboard, returns 0 if all is OK
  */
-int
+static int
 writeboard()
+{
 	int             i;
 	set_score_output();
 	if (gid != egid)
 		setegid(egid);
 	i = lcreat(scorefile);
 	if (gid != egid)
 		setegid(gid);
 	if (i < 0) {
 		lprcat("Can't write scoreboard\n");
 		lflush();
 @@ -236,27 +246,27 @@ paytaxes(x)
 				set_score_output();
 				if (writeboard() < 0)
 					return (0);
 				return (amt);
+			}
 	return (0L);		/* couldn't find user on winning scoreboard */
+}
 /*
  * winshou()		Subroutine to print out the winning scoreboard
+ *
  * Returns the number of players on scoreboard that were shown
  */
-int
+static int
 winshou()
+{
 	struct wscofmt *p;
 	int    i, j, count;
 	for (count = j = i = 0; i < SCORESIZE; i++)	/* is there anyone on
 							 * the scoreboard? */
 		if (winr[i].score != 0) {
 			j++;
 			break;
+		}
 	if (j) {
 		lprcat("\n  Score    Difficulty   Time Needed   Larn Winners List\n");
 @@ -275,27 +285,27 @@ winshou()
+				}
+			}
+	}
 	return (count);		/* return number of people on scoreboard */
+}
 /*
  * shou(x)			Subroutine to print out the non-winners scoreboard
  * 	int x;
+ *
  * Enter with 0 to list the scores, enter with 1 to list inventories too
  * Returns the number of players on scoreboard that were shown
  */
-int
+static int
 shou(x)
 	int             x;
+{
 	int    i, j, n, k;
 	int             count;
 	for (count = j = i = 0; i < SCORESIZE; i++)	/* is the scoreboard
 							 * empty? */
 		if (sco[i].score != 0) {
 			j++;
 			break;
+		}
 	if (j) {
 		lprcat("\n   Score   Difficulty   Larn Visitor Log\n");
 @@ -380,27 +390,27 @@ showallscores()
 	j = shou(1);
 	if (i + j == 0)
 		lprcat(esb);
 	else
 		lprc('\n');
 	lflush();
+}
 /*
  * sortboard()		Function to sort the scoreboard
+ *
  * Returns 0 if no sorting done, else returns 1
  */
-int
+static int
 sortboard()
+{
 	int    i, j = 0, pos;
 	long            jdat;
 	for (i = 0; i < SCORESIZE; i++)
 		sco[i].order = winr[i].order = -1;
 	pos = 0;
 	while (pos < SCORESIZE) {
 		jdat = 0;
 		for (i = 0; i < SCORESIZE; i++)
 			if ((sco[i].order < 0) && (sco[i].score >= jdat)) {
 				j = i;
 				jdat = sco[i].score;
 @@ -419,27 +429,27 @@ sortboard()
+	}
 	return (1);
+}
 /*
  * newscore(score, whoo, whyded, winner) 	Function to add entry to scoreboard
  * 	int score, winner, whyded;
  * 	char *whoo;
+ *
  * Enter with the total score in gp in score,  players name in whoo,
  * 	died() reason # in whyded, and TRUE/FALSE in winner if a winner
  * ex.		newscore(1000, "player 1", 32, 0);
  */
-void
+static void
 newscore(score, whoo, whyded, winner)
 	long            score;
 	int             winner, whyded;
 	char           *whoo;
+{
 	int    i;
 	long            taxes;
 	if (readboard() < 0)
 		return;		/* do the scoreboard	 */
 	/* if a winner then delete all non-winning scores */
 	if (cheat)
 		winner = 0;	/* if he cheated, don't let him win */
 	if (winner) {
 @@ -488,54 +498,54 @@ newscore(score, whoo, whyded, winner)
+	}
+}
 /*
  * new1sub(score,i,whoo,taxes) 	  Subroutine to put player into a
  * 	int score,i,whyded,taxes;		  winning scoreboard entry if his score
  * 	char *whoo; 					  is high enough
+ *
  * Enter with the total score in gp in score,  players name in whoo,
  * 	died() reason # in whyded, and TRUE/FALSE in winner if a winner
  * 	slot in scoreboard in i, and the tax bill in taxes.
  * Returns nothing of value
  */
-void
+static void
 new1sub(score, i, whoo, taxes)
 	long            score, taxes;
 	int             i;
 	char           *whoo;
+{
 	struct wscofmt *p;
 	p = &winr[i];
 	p->taxes += taxes;
 	if ((score >= p->score) || (c[HARDGAME] > p->hardlev)) {
 		strcpy(p->who, whoo);
 		p->score = score;
 		p->hardlev = c[HARDGAME];
 		p->suid = userid;
 		p->timeused = gltime / 100;
+	}
+}
 /*
  * new2sub(score,i,whoo,whyded)	 	  Subroutine to put player into a
  * 	int score,i,whyded,taxes;		  non-winning scoreboard entry if his
  * 	char *whoo; 					  score is high enough
+ *
  * Enter with the total score in gp in score,  players name in whoo,
  * 	died() reason # in whyded, and slot in scoreboard in i.
  * Returns nothing of value
  */
-void
+static void
 new2sub(score, i, whoo, whyded)
 	long            score;
 	int             i, whyded;
 	char           *whoo;
+{
 	int    j;
 	struct scofmt *p;
 	p = &sco[i];
 	if ((score >= p->score) || (c[HARDGAME] > p->hardlev)) {
 		strcpy(p->who, whoo);
 		p->score = score;
 		p->what = whyded;
 		p->hardlev = c[HARDGAME];
 @@ -722,27 +732,27 @@ invalid:
 	if ((x == 256) || (x == 257) || (f != 0))
 		exit(0);
 	if (scorerror == 0)
 		showscores();	/* if we updated the scoreboard */
 	if (x == 263)
 		mailbill();
 	exit(0);
+}
 /*
  * diedsub(x) Subroutine to print out the line showing the player when he is killed
  * 	int x;
  */
-void
+static void
 diedsub(int x)
+{
 	char   ch;
 	const char *mod;
 	lprintf("Score: %ld, Diff: %ld,  %s ", (long) c[GOLD], (long) c[HARDGAME], logname);
 	if (x < 256) {
 		ch = *monster[x].name;
 		if (ch == 'a' || ch == 'e' || ch == 'i' || ch == 'o' || ch == 'u')
 			mod = "an";
 		else
 			mod = "a";
 		lprintf("killed by %s %s", mod, monster[x].name);

 @@ -1,26 +1,27 @@
-/*	$NetBSD: help.c,v 1.7 2008/02/03 21:24:58 dholland Exp $	*/
+/*	$NetBSD: help.c,v 1.8 2009/08/12 08:04:05 dholland Exp $	*/
 /* help.c		Larn is copyrighted 1986 by Noah Morgan. */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: help.c,v 1.7 2008/02/03 21:24:58 dholland Exp $");
+__RCSID("$NetBSD: help.c,v 1.8 2009/08/12 08:04:05 dholland Exp $");
 #endif /* not lint */
 #include <unistd.h>
 #include "header.h"
 #include "extern.h"
 static void retcont(void);
 static int openhelp(void);
 /*
  *	help function to display the help info
+ *
  *	format of the .larn.help file
+ *
  *	1st character of file:	# of pages of help available (ascii digit)
  *	page (23 lines) for the introductory message (not counted in above)
  *	pages of help text (23 lines per page)
  */
 void
 help()
 @@ -88,27 +89,27 @@ welcome()
 #else	/* VT100 */
+	{
 		tmcapcnv(tmbuf, lgetl());
 		lprcat(tmbuf);
 	}			/* intercept \33's */
 #endif	/* VT100 */
 	lrclose();
 	retcont();		/* press return to continue */
+}
 /*
  *	function to say press return to continue and reset scroll when done
  */
-void
+static void
 retcont()
+{
 	cursor(1, 24);
 	lprcat("Press ");
 	standout("return");
 	lprcat(" to continue: ");
 	while (ttgetch() != '\n');
 	setscroll();
+}
 /*
  *	routine to open the help file and return the first character - '0'
  */