 @@ -1,14 +1,14 @@
-/*	$NetBSD: auto.c,v 1.8 2008/04/28 20:22:54 martin Exp $	*/
+/*	$NetBSD: auto.c,v 1.9 2009/07/20 05:44:02 dholland Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -63,83 +63,80 @@ static int xinc(int);
 static int yinc(int);
 static const char *find_moves(void);
 static COORD *closest_robot(int *);
 static COORD *closest_heap(int *);
 static char move_towards(int, int);
 static char move_away(COORD *);
 static char move_between(COORD *, COORD *);
 static int between(COORD *, COORD *);
 /* distance():
  * 	return "move" number distance of the two coordinates
  */
 static int
-distance(x1, y1, x2, y2)
+distance(int x1, int y1, int x2, int y2)
 	int x1, y1, x2, y2;
+{
 	return MAX(ABS(ABS(x1) - ABS(x2)), ABS(ABS(y1) - ABS(y2)));
 } /* end distance */
 /* xinc():
  *	Return x coordinate moves
  */
 static int
-xinc(dir)
+xinc(int dir)
         int dir;
+{
         switch(dir) {
         case 'b':
         case 'h':
         case 'y':
                 return -1;
         case 'l':
         case 'n':
         case 'u':
                 return 1;
         case 'j':
         case 'k':
         default:
                 return 0;
+        }
+}
 /* yinc():
  *	Return y coordinate moves
  */
 static int
-yinc(dir)
+yinc(int dir)
         int dir;
+{
         switch(dir) {
         case 'k':
         case 'u':
         case 'y':
                 return -1;
         case 'b':
         case 'j':
         case 'n':
                 return 1;
         case 'h':
         case 'l':
         default:
                 return 0;
+        }
+}
 /* find_moves():
  *	Find possible moves
  */
 static const char *
-find_moves()
+find_moves(void)
+{
         int x, y;
         COORD test;
         const char *m;
         char *a;
         static const char moves[] = ".hjklyubn";
         static char ans[sizeof moves];
         a = ans;
         for(m = moves; *m; m++) {
                 test.x = My_pos.x + xinc(*m);
                 test.y = My_pos.y + yinc(*m);
                 move(test.y, test.x);
 @@ -159,123 +156,117 @@ find_moves()
+        }
         *a = 0;
         if(ans[0])
                 return ans;
         else
                 return "t";
+}
 /* closest_robot():
  *	return the robot closest to us
  *	and put in dist its distance
  */
 static COORD *
-closest_robot(dist)
+closest_robot(int *dist)
 	int *dist;
+{
 	COORD *rob, *end, *minrob = NULL;
 	int tdist, mindist;
 	mindist = 1000000;
 	end = &Robots[MAXROBOTS];
 	for (rob = Robots; rob < end; rob++) {
 		tdist = distance(My_pos.x, My_pos.y, rob->x, rob->y);
 		if (tdist < mindist) {
 			minrob = rob;
 			mindist = tdist;
+		}
+	}
 	*dist = mindist;
 	return minrob;
 } /* end closest_robot */
 /* closest_heap():
  *	return the heap closest to us
  *	and put in dist its distance
  */
 static COORD *
-closest_heap(dist)
+closest_heap(int *dist)
 	int *dist;
+{
 	COORD *hp, *end, *minhp = NULL;
 	int mindist, tdist;
 	mindist = 1000000;
 	end = &Scrap[MAXROBOTS];
 	for (hp = Scrap; hp < end; hp++) {
 		if (hp->x == 0 && hp->y == 0)
 			break;
 		tdist = distance(My_pos.x, My_pos.y, hp->x, hp->y);
 		if (tdist < mindist) {
 			minhp = hp;
 			mindist = tdist;
+		}
+	}
 	*dist = mindist;
 	return minhp;
 } /* end closest_heap */
 /* move_towards():
  *	move as close to the given direction as possible
  */
 static char
-move_towards(dx, dy)
+move_towards(int dx, int dy)
 	int dx, dy;
+{
 	char ok_moves[10], best_move;
 	char *ptr;
 	int move_judge, cur_judge, mvx, mvy;
 	(void)strcpy(ok_moves, find_moves());
 	best_move = ok_moves[0];
 	if (best_move != 't') {
 		mvx = xinc(best_move);
 		mvy = yinc(best_move);
 		move_judge = ABS(mvx - dx) + ABS(mvy - dy);
 		for (ptr = &ok_moves[1]; *ptr != '\0'; ptr++) {
 			mvx = xinc(*ptr);
 			mvy = yinc(*ptr);
 			cur_judge = ABS(mvx - dx) + ABS(mvy - dy);
 			if (cur_judge < move_judge) {
 				move_judge = cur_judge;
 				best_move = *ptr;
+			}
+		}
+	}
 	return best_move;
 } /* end move_towards */
 /* move_away():
  *	move away form the robot given
  */
 static char
-move_away(rob)
+move_away(COORD *rob)
 	COORD *rob;
+{
 	int dx, dy;
 	dx = sign(My_pos.x - rob->x);
 	dy = sign(My_pos.y - rob->y);
 	return  move_towards(dx, dy);
 } /* end move_away */
 /* move_between():
  *	move the closest heap between us and the closest robot
  */
 static char
-move_between(rob, hp)
+move_between(COORD *rob, COORD *hp)
 	COORD *rob;
 	COORD *hp;
+{
 	int dx, dy;
 	float slope, cons;
 	/* equation of the line between us and the closest robot */
 	if (My_pos.x == rob->x) {
 		/*
 		 * me and the robot are aligned in x
 		 * change my x so I get closer to the heap
 		 * and my y far from the robot
 		 */
 		dx = - sign(My_pos.x - hp->x);
 		dy = sign(My_pos.y - rob->y);
 @@ -304,61 +295,59 @@ move_between(rob, hp)
 			dx = sign(My_pos.x - rob->x);
 			dy = sign(((slope * ((float) hp->x)) + cons) -
 				  ((float) hp->y));
+		}
 		else {
 			dx = sign(((slope * ((float) hp->x)) + cons) -
 				  ((float) hp->y));
 			dy = sign(My_pos.y - rob->y);
+		}
+	}
 	CONSDEBUG(("me (%d,%d) robot(%d,%d) heap(%d,%d) delta(%d,%d)",
 		My_pos.x, My_pos.y, rob->x, rob->y, hp->x, hp->y, dx, dy));
 	return move_towards(dx, dy);
 } /* end move_between */
 /* between():
  * 	Return true if the heap is between us and the robot
  */
 int
-between(rob, hp)
+between(COORD *rob, COORD *hp)
 	COORD *rob;
 	COORD *hp;
+{
 	/* I = @ */
 	if (hp->x > rob->x && My_pos.x < rob->x)
 		return 0;
 	/* @ = I */
 	if (hp->x < rob->x && My_pos.x > rob->x)
 		return 0;
 	/* @ */
 	/* = */
 	/* I */
 	if (hp->y < rob->y && My_pos.y > rob->y)
 		return 0;
 	/* I */
 	/* = */
 	/* @ */
 	if (hp->y > rob->y && My_pos.y < rob->y)
 		return 0;
 	return 1;
 } /* end between */
 /* automove():
  * 	find and do the best move if flag
  *	else get the first move;
  */
 char
-automove()
+automove(void)
+{
 #if 0
 	return  find_moves()[0];
 #else
 	COORD *robot_close;
 	COORD *heap_close;
 	int robot_dist, robot_heap, heap_dist;
 	robot_close = closest_robot(&robot_dist);
 	if (robot_dist > 1)
 		return('.');
 	if (!Num_scrap)
 		/* no scrap heaps just run away */
 @@ -366,14 +355,14 @@ automove()
 	heap_close = closest_heap(&heap_dist);
 	robot_heap = distance(robot_close->x, robot_close->y,
 	    heap_close->x, heap_close->y);
 	if (robot_heap <= heap_dist && !between(robot_close, heap_close)) {
 		/*
 		 * robot is closest to us from the heap. Run away!
 		 */
 		return  move_away(robot_close);
+	}
 	return move_between(robot_close, heap_close);
 #endif
 } /* end automove */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_field.c,v 1.8 2003/08/07 09:37:36 agc Exp $	*/
+/*	$NetBSD: init_field.c,v 1.9 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,42 +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[] = "@(#)init_field.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: init_field.c,v 1.8 2003/08/07 09:37:36 agc Exp $");
+__RCSID("$NetBSD: init_field.c,v 1.9 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 static int telx = 0;
 static int tely = 0;
 /*
  * init_field:
  *	Lay down the initial pattern whih is constant across all levels,
  *	and initialize all the global variables.
  */
 void
-init_field()
+init_field(void)
+{
 	int		i;
 	static bool	first = TRUE;
 	static const char	*const desc[] = {
 				"Directions:",
 				"",
 				"y k u",
 				" \\|/",
 				"h- -l",
 				" /|\\",
 				"b j n",
 				"",
 				"Commands:",
 @@ -113,19 +113,18 @@ init_field()
+	}
 	telx = X_FIELDSIZE + 2;
 	tely = i;
 	if (first)
 		refresh();
 	first = FALSE;
 #ifdef	FANCY
 	if (Pattern_roll)
 		Next_move = &Move_list[-1];
 #endif
+}
 void
-telmsg(on)
+telmsg(int on)
 	int on;
+{
 	move(tely, telx);
 	addstr(on ? "Teleport!" : "         ");
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: flush_in.c,v 1.6 2003/08/07 09:37:36 agc Exp $	*/
+/*	$NetBSD: flush_in.c,v 1.7 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,28 +24,28 @@
  * 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[] = "@(#)flush_in.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: flush_in.c,v 1.6 2003/08/07 09:37:36 agc Exp $");
+__RCSID("$NetBSD: flush_in.c,v 1.7 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 /*
  * flush_in:
  *	Flush all pending input.
  */
 void
-flush_in()
+flush_in(void)
+{
 	tcflush(fileno(stdin), TCIFLUSH);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: play_level.c,v 1.6 2003/08/07 09:37:37 agc Exp $	*/
+/*	$NetBSD: play_level.c,v 1.7 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,38 +24,38 @@
  * 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[] = "@(#)play_level.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: play_level.c,v 1.6 2003/08/07 09:37:37 agc Exp $");
+__RCSID("$NetBSD: play_level.c,v 1.7 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 /*
  * play_level:
  *	Let the player play the current level
  */
 void
-play_level()
+play_level(void)
+{
 	COORD	*cp;
 	move(My_pos.y, My_pos.x);
 	addch(PLAYER);
 	refresh();
 	for (cp = Robots; cp < &Robots[MAXROBOTS]; cp++) {
 		if (cp->y < 0)
 			continue;
 		move(cp->y, cp->x);
 		addch(ROBOT);
+	}
 	refresh();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: query.c,v 1.6 2003/08/07 09:37:37 agc Exp $	*/
+/*	$NetBSD: query.c,v 1.7 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,39 +24,38 @@
  * 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[] = "@(#)query.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: query.c,v 1.6 2003/08/07 09:37:37 agc Exp $");
+__RCSID("$NetBSD: query.c,v 1.7 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 /*
  * query:
  *	Ask a question and get a yes or no answer.  Default is "no".
  */
 int
-query(prompt)
+query(const char *prompt)
 	const char	*prompt;
+{
 	int	c, retval;
 	int	y, x;
 	getyx(stdscr, y, x);
 	move(Y_PROMPT, X_PROMPT);
 	addstr(prompt);
 	clrtoeol();
 	refresh();
 	retval = ((c = getchar()) == 'y' || c == 'Y');
 	move(Y_PROMPT, X_PROMPT);
 	clrtoeol();
 	move(y, x);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.24 2008/08/08 16:10:47 drochner Exp $	*/
+/*	$NetBSD: main.c,v 1.25 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -29,41 +29,37 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.24 2008/08/08 16:10:47 drochner Exp $");
+__RCSID("$NetBSD: main.c,v 1.25 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 int main(int, char **);
 extern const char	*Scorefile;
 extern int	Max_per_uid;
 int
-main(ac, av)
+main(int ac, char **av)
 	int	ac;
 	char	**av;
+{
 	const char	*sp;
 	bool	bad_arg;
 	bool	show_only;
 	int		score_wfd; /* high score writable file descriptor */
 	int		score_err = 0; /* hold errno from score file open */
 	score_wfd = open(Scorefile, O_RDWR);
 	if (score_wfd < 0)
 		score_err = errno;
 	else if (score_wfd < 3)
 		exit(1);
 @@ -187,40 +183,39 @@ main(ac, av)
+		}
 		Num_games = 1;
 	} while (!Auto_bot && another());
 	quit(0);
 	/* NOTREACHED */
 	return(0);
+}
 /*
  * quit:
  *	Leave the program elegantly.
  */
 void
-quit(dummy)
+quit(int dummy __unused)
 	int dummy __unused;
+{
 	endwin();
 	exit(0);
 	/* NOTREACHED */
+}
 /*
  * another:
  *	See if another game is desired
  */
 bool
-another()
+another(void)
+{
 	int	y;
 #ifdef	FANCY
 	if ((Stand_still || Pattern_roll) && !Newscore)
 		return TRUE;
 #endif
 	if (query("Another game?")) {
 		if (Full_clear) {
 			for (y = 1; y <= Num_scores; y++) {
 				move(y, 1);
 				clrtoeol();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: make_level.c,v 1.7 2003/08/07 09:37:36 agc Exp $	*/
+/*	$NetBSD: make_level.c,v 1.8 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,38 +24,38 @@
  * 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[] = "@(#)make_level.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: make_level.c,v 1.7 2003/08/07 09:37:36 agc Exp $");
+__RCSID("$NetBSD: make_level.c,v 1.8 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 /*
  * make_level:
  *	Make the current level
  */
 void
-make_level()
+make_level(void)
+{
 	int	i;
 	COORD	*cp;
 	int	x;
 	reset_count();
 	for (i = 1; i < Y_FIELDSIZE; i++)
 		for (x = 1; x < X_FIELDSIZE; x++)
 			if (Field[i][x] != 0)
 				mvaddch(i, x, ' ');
 	if (My_pos.y > 0)
 		mvaddch(My_pos.y, My_pos.x, ' ');

 @@ -1,14 +1,14 @@
-/*	$NetBSD: move_robs.c,v 1.7 2003/08/07 09:37:37 agc Exp $	*/
+/*	$NetBSD: move_robs.c,v 1.8 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,39 +24,38 @@
  * 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[] = "@(#)move_robs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: move_robs.c,v 1.7 2003/08/07 09:37:37 agc Exp $");
+__RCSID("$NetBSD: move_robs.c,v 1.8 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 /*
  * move_robots:
  *	Move the robots around
  */
 void
-move_robots(was_sig)
+move_robots(int was_sig)
 	int	was_sig;
+{
 	COORD		*rp;
 	if (Real_time)
 		signal(SIGALRM, move_robots);
 # ifdef DEBUG
 	move(Min.y, Min.x);
 	addch(inch());
 	move(Max.y, Max.x);
 	addch(inch());
 # endif /* DEBUG */
 	for (rp = Robots; rp < &Robots[MAXROBOTS]; rp++) {
 		if (rp->y < 0)
 @@ -119,36 +118,34 @@ move_robots(was_sig)
 	move(Max.y, Max.x);
 	addch(inch());
 	standend();
 # endif /* DEBUG */
 	if (Real_time)
 		alarm(3);
+}
 /*
  * add_score:
  *	Add a score to the overall point total
  */
 void
-add_score(add)
+add_score(int add)
 	int	add;
+{
 	Score += add;
 	move(Y_SCORE, X_SCORE);
 	printw("%d", Score);
+}
 /*
  * sign:
  *	Return the sign of the number
  */
 int
-sign(n)
+sign(int n)
 	int	n;
+{
 	if (n < 0)
 		return -1;
 	else if (n > 0)
 		return 1;
 	else
 		return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: move.c,v 1.12 2004/08/27 09:07:08 christos Exp $	*/
+/*	$NetBSD: move.c,v 1.13 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,40 +24,40 @@
  * 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[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: move.c,v 1.12 2004/08/27 09:07:08 christos Exp $");
+__RCSID("$NetBSD: move.c,v 1.13 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 #include "robots.h"
 # define	ESC	'\033'
 /*
  * get_move:
  *	Get and execute a move from the player
  */
 void
-get_move()
+get_move(void)
+{
 	int		c;
 #ifdef FANCY
 	int		lastmove;
 #endif /*FANCY*/
 	if (Waiting)
 		return;
 #ifdef	FANCY
 	if (Pattern_roll) {
 		if (Next_move >= Move_list)
 			lastmove = *Next_move;
 @@ -198,27 +198,27 @@ teleport:
+	}
 ret:
 	if (Count > 0)
 		if (--Count == 0)
 			leaveok(stdscr, FALSE);
+}
 /*
  * must_telep:
  *	Must I teleport; i.e., is there anywhere I can move without
  * being eaten?
  */
 bool
-must_telep()
+must_telep(void)
+{
 	int		x, y;
 	static COORD	newpos;
 #ifdef	FANCY
 	if (Stand_still && Num_robots > 1 && eaten(&My_pos))
 		return TRUE;
 #endif
 	for (y = -1; y <= 1; y++) {
 		newpos.y = My_pos.y + y;
 		if (newpos.y <= 0 || newpos.y >= Y_FIELDSIZE)
 			continue;
 @@ -230,28 +230,27 @@ must_telep()
 				continue;
 			if (!eaten(&newpos))
 				return FALSE;
+		}
+	}
 	return TRUE;
+}
 /*
  * do_move:
  *	Execute a move
  */
 bool
-do_move(dy, dx)
+do_move(int dy, int dx)
 	int	dy, dx;
+{
 	static COORD	newpos;
 	newpos.y = My_pos.y + dy;
 	newpos.x = My_pos.x + dx;
 	if (newpos.y <= 0 || newpos.y >= Y_FIELDSIZE ||
 	    newpos.x <= 0 || newpos.x >= X_FIELDSIZE ||
 	    Field[newpos.y][newpos.x] > 0 || eaten(&newpos)) {
 		if (Running) {
 			Running = FALSE;
 			leaveok(stdscr, FALSE);
 			move(My_pos.y, My_pos.x);
 			refresh();
 @@ -267,53 +266,52 @@ do_move(dy, dx)
 	mvaddch(My_pos.y, My_pos.x, ' ');
 	My_pos = newpos;
 	mvaddch(My_pos.y, My_pos.x, PLAYER);
 	if (!jumping())
 		refresh();
 	return TRUE;
+}
 /*
  * eaten:
  *	Player would get eaten at this place
  */
 bool
-eaten(pos)
+eaten(const COORD *pos)
 	const COORD	*pos;
+{
 	int	x, y;
 	for (y = pos->y - 1; y <= pos->y + 1; y++) {
 		if (y <= 0 || y >= Y_FIELDSIZE)
 			continue;
 		for (x = pos->x - 1; x <= pos->x + 1; x++) {
 			if (x <= 0 || x >= X_FIELDSIZE)
 				continue;
 			if (Field[y][x] == 1)
 				return TRUE;
+		}
+	}
 	return FALSE;
+}
 /*
  * reset_count:
  *	Reset the count variables
  */
 void
-reset_count()
+reset_count(void)
+{
 	Count = 0;
 	Running = FALSE;
 	leaveok(stdscr, FALSE);
 	refresh();
+}
 /*
  * jumping:
  *	See if we are jumping, i.e., we should not refresh.
  */
 bool
-jumping()
+jumping(void)
+{
 	return (Jump && (Count || Running || Waiting));
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rnd_pos.c,v 1.5 2003/08/07 09:37:37 agc Exp $	*/
+/*	$NetBSD: rnd_pos.c,v 1.6 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,47 +24,46 @@
  * 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[] = "@(#)rnd_pos.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: rnd_pos.c,v 1.5 2003/08/07 09:37:37 agc Exp $");
+__RCSID("$NetBSD: rnd_pos.c,v 1.6 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 # define	IS_SAME(p,y,x)	((p).y != -1 && (p).y == y && (p).x == x)
 /*
  * rnd_pos:
  *	Pick a random, unoccupied position
  */
 COORD *
-rnd_pos()
+rnd_pos(void)
+{
 	static COORD	pos;
 	static int	call = 0;
 	do {
 		pos.y = rnd(Y_FIELDSIZE - 1) + 1;
 		pos.x = rnd(X_FIELDSIZE - 1) + 1;
 		refresh();
 	} while (Field[pos.y][pos.x] != 0);
 	call++;
 	return &pos;
+}
 int
-rnd(range)
+rnd(int range)
 	int	range;
+{
 	return rand() % range;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: robots.h,v 1.18 2004/01/27 20:30:30 jsm Exp $	*/
+/*	$NetBSD: robots.h,v 1.19 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -107,40 +107,40 @@ extern bool	Pattern_roll, Stand_still;
 extern char	Cnt_move, Field[Y_FIELDSIZE][X_FIELDSIZE], Run_ch;
 extern const char *Next_move, *Move_list;
 extern int	Count, Level, Num_robots, Num_scrap, Num_scores,
 		Start_level, Wait_bonus, Num_games;
 extern u_int32_t	Score;
 extern COORD	Max, Min, My_pos, Robots[], Scrap[];
 extern jmp_buf	End_move;
 /*
- * functions types
+ * functions
  */
 void	add_score(int);
 bool	another(void);
 char	automove(void);
 int	cmp_sc(const void *, const void *);
 bool	do_move(int, int);
 bool	eaten(const COORD *);
 void	flush_in(void);
 void	get_move(void);
 void	init_field(void);
 bool	jumping(void);
 void	make_level(void);
 void	move_robots(int);
 bool	must_telep(void);
 void	play_level(void);
 int	query(const char *);
-void	quit(int) __attribute__((__noreturn__));
+void	quit(int) __dead;
 void	reset_count(void);
 int	rnd(int);
 COORD  *rnd_pos(void);
 void	score(int);
 void	set_name(SCORE *);
 void	show_score(void);
 int	sign(int);
 void	telmsg(int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: score.c,v 1.18 2006/03/17 23:11:47 abs Exp $	*/
+/*	$NetBSD: score.c,v 1.19 2009/07/20 05:44:02 dholland Exp $	*/
 /*
  * Copyright (c) 1980, 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.
 @@ -24,106 +24,103 @@
  * 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[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.18 2006/03/17 23:11:47 abs Exp $");
+__RCSID("$NetBSD: score.c,v 1.19 2009/07/20 05:44:02 dholland Exp $");
 #endif
 #endif /* not lint */
 # include	"robots.h"
 # include	"pathnames.h"
 const char	*Scorefile = _PATH_SCORE;
 int	Max_per_uid = MAX_PER_UID;
 static SCORE	Top[MAXSCORES];
 static u_int32_t	numscores, max_uid;
 static void read_score(int);
 static void write_score(int);
 /*
  * read_score:
  *	Read the score file in MI format
  */
 static void
-read_score(inf)
+read_score(int inf)
 	int inf;
+{
 	SCORE	*scp;
 	if (read(inf, &max_uid, sizeof max_uid) == sizeof max_uid) {
 		max_uid = ntohl(max_uid);
 		read(inf, Top, sizeof Top);
 		for (scp = Top; scp < &Top[MAXSCORES]; scp++) {
 			 scp->s_uid = ntohl(scp->s_uid);
 			 scp->s_score = ntohl(scp->s_score);
 			 scp->s_auto = ntohl(scp->s_auto);
 			 scp->s_level = ntohl(scp->s_level);
+		}
+	}
 	else {
 		for (scp = Top; scp < &Top[MAXSCORES]; scp++)
 			scp->s_score = 0;
 		max_uid = Max_per_uid;
+	}
+}
 /*
  * write_score:
  *	Write the score file in MI format
  */
 static void
-write_score(inf)
+write_score(int inf)
 	int inf;
+{
 	SCORE	*scp;
 	lseek(inf, 0L, SEEK_SET);
 	max_uid = htonl(max_uid);
 	write(inf, &max_uid, sizeof max_uid);
 	for (scp = Top; scp < &Top[MAXSCORES]; scp++) {
 		 scp->s_uid = htonl(scp->s_uid);
 		 scp->s_score = htonl(scp->s_score);
 		 scp->s_auto = htonl(scp->s_auto);
 		 scp->s_level = htonl(scp->s_level);
+	}
 	write(inf, Top, sizeof Top);
+}
 /*
  * score:
  *	Post the player's score, if reasonable, and then print out the
  *	top list.
  */
 void
-score(score_wfd)
+score(int score_wfd)
 	int score_wfd;
+{
 	int			inf = score_wfd;
 	SCORE			*scp;
 	u_int32_t		uid;
 	bool			done_show = FALSE;
 	Newscore = FALSE;
 	if (inf < 0)
 		return;
 	read_score(inf);
 	uid = getuid();
 @@ -179,54 +176,52 @@ score(score_wfd)
 			done_show = TRUE;
+		}
+	}
 	Num_scores = scp - Top;
 	refresh();
 	if (Newscore) {
 		write_score(inf);
+	}
 	lseek(inf, 0, SEEK_SET);
+}
 void
-set_name(scp)
+set_name(SCORE *scp)
 	SCORE	*scp;
+{
 	PASSWD	*pp;
 	if ((pp = getpwuid(scp->s_uid)) == NULL)
 		strncpy(scp->s_name, "???", MAXNAME);
 	else
 		strncpy(scp->s_name, pp->pw_name, MAXNAME);
+}
 /*
  * cmp_sc:
  *	Compare two scores.
  */
 int
-cmp_sc(s1, s2)
+cmp_sc(const void *s1, const void *s2)
 	const void *s1, *s2;
+{
 	return ((const SCORE *)s2)->s_score - ((const SCORE *)s1)->s_score;
+}
 /*
  * show_score:
  *	Show the score list for the '-s' option.
  */
 void
-show_score()
+show_score(void)
+{
 	SCORE		*scp;
 	int		inf;
 	if ((inf = open(Scorefile, O_RDONLY)) < 0) {
 		warn("opening `%s'", Scorefile);
 		return;
+	}
 	read_score(inf);
 	close(inf);
 	inf = 1;
 	printf("%5.5s %5.5s %-9.9s %-8.8s %5.5s\n", "Rank", "Score", "User",