--- src/games/sail/pl_7.c	2003/06/17 04:25:25	1.2
+++ src/games/sail/pl_7.c	2006/09/03 17:33:13	1.3
@@ -32,7 +32,7 @@
  *
  * @(#)pl_7.c	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/games/sail/pl_7.c,v 1.7 1999/11/30 03:49:37 billf Exp $
- * $DragonFly: src/games/sail/pl_7.c,v 1.1 2003/06/16 03:52:24 dillon Exp $
+ * $DragonFly$
  */
 
 #include <sys/ttydefaults.h>
@@ -45,11 +45,17 @@
  */
 
 static char sc_hasprompt;
-static char *sc_prompt;
-static char *sc_buf;
+static const char *sc_prompt;
+static const char *sc_buf;
 static int sc_line;
 
-initscreen()
+static void	Scroll(void);
+static void	prompt(const char *, struct ship *);
+static void	endprompt(char);
+static void	adjustview(void);
+
+void
+initscreen(void)
 {
 	/* initscr() already done in SCREENTEST() */
 	view_w = newwin(VIEW_Y, VIEW_X, VIEW_T, VIEW_L);
@@ -58,32 +64,33 @@ initscreen()
 	stat_w = newwin(STAT_Y, STAT_X, STAT_T, STAT_L);
 	turn_w = newwin(TURN_Y, TURN_X, TURN_T, TURN_L);
 	done_curses++;
-	(void) leaveok(view_w, 1);
-	(void) leaveok(slot_w, 1);
-	(void) leaveok(stat_w, 1);
-	(void) leaveok(turn_w, 1);
+	leaveok(view_w, 1);
+	leaveok(slot_w, 1);
+	leaveok(stat_w, 1);
+	leaveok(turn_w, 1);
 	noecho();
 	crmode();
 }
 
-cleanupscreen()
+void
+cleanupscreen(void)
 {
 	/* alarm already turned off */
 	if (done_curses) {
-		(void) wmove(scroll_w, SCROLL_Y - 1, 0);
-		(void) wclrtoeol(scroll_w);
+		wmove(scroll_w, SCROLL_Y - 1, 0);
+		wclrtoeol(scroll_w);
 		draw_screen();
 		endwin();
 	}
 }
 
 void
-newturn()
+newturn(void)
 {
 	repaired = loaded = fired = changed = 0;
 	movebuf[0] = '\0';
 
-	(void) alarm(0);
+	alarm(0);
 	if (mf->readyL & R_LOADING) {
 		if (mf->readyL & R_DOUBLE)
 			mf->readyL = R_LOADING;
@@ -100,15 +107,15 @@ newturn()
 		Write(W_DDEAD, SHIP(0), 0, 0, 0, 0, 0);
 
 	if (sc_hasprompt) {
-		(void) wmove(scroll_w, sc_line, 0);
-		(void) wclrtoeol(scroll_w);
+		wmove(scroll_w, sc_line, 0);
+		wclrtoeol(scroll_w);
 	}
 	if (Sync() < 0)
 		leave(LEAVE_SYNC);
 	if (!hasdriver)
 		leave(LEAVE_DRIVER);
 	if (sc_hasprompt)
-		(void) wprintw(scroll_w, "%s%s", sc_prompt, sc_buf);
+		wprintw(scroll_w, "%s%s", sc_prompt, sc_buf);
 
 	if (turn % 50 == 0)
 		Write(W_ALIVE, SHIP(0), 0, 0, 0, 0, 0);
@@ -127,84 +134,84 @@ newturn()
 	adjustview();
 	draw_screen();
 
-	(void) signal(SIGALRM, newturn);
-	(void) alarm(7);
+	signal(SIGALRM, (sig_t)newturn);
+	alarm(7);
 }
 
 /*VARARGS2*/
-Signal(fmt, ship, a, b, c, d)
-char *fmt;
-struct ship *ship;
-int a, b, c, d;
+void
+Signal(const char *fmt, struct ship *ship, ...)
 {
+	va_list ap;
+	char format[BUFSIZ];
+
 	if (!done_curses)
 		return;
+	va_start(ap, ship);
 	if (*fmt == '\7')
 		putchar(*fmt++);
 	if (ship == 0)
-		(void) wprintw(scroll_w, fmt, a, b, c, d);
-	else
-		(void) wprintw(scroll_w, fmt, ship->shipname,
-			colours(ship), sterncolour(ship), a, b, c, d);
+		vw_printw(scroll_w, fmt, ap);
+	else {
+		fmtship(format, sizeof(format), fmt, ship);
+		vw_printw(scroll_w, format, ap);
+	}
+	va_end(ap);
 	Scroll();
 }
 
-Scroll()
+static void
+Scroll(void)
 {
 	if (++sc_line >= SCROLL_Y)
 		sc_line = 0;
-	(void) wmove(scroll_w, sc_line, 0);
-	(void) wclrtoeol(scroll_w);
+	wmove(scroll_w, sc_line, 0);
+	wclrtoeol(scroll_w);
 }
 
-prompt(p, ship)
-char *p;
-struct ship *ship;
+static void
+prompt(const char *p, struct ship *ship)
 {
 	static char buf[60];
 
 	if (ship != 0) {
-		(void)sprintf(buf, p, ship->shipname, colours(ship),
+		printf(buf, p, ship->shipname, colours(ship),
 			sterncolour(ship));
 		p = buf;
 	}
 	sc_prompt = p;
 	sc_buf = "";
 	sc_hasprompt = 1;
-	(void) waddstr(scroll_w, p);
+	waddstr(scroll_w, p);
 }
 
-endprompt(flag)
-char flag;
+static void
+endprompt(char flag)
 {
 	sc_hasprompt = 0;
 	if (flag)
 		Scroll();
 }
 
-sgetch(p, ship, flag)
-char *p;
-struct ship *ship;
-char flag;
+int
+sgetch(const char *p, struct ship *ship, char flag)
 {
 	int c;
 
 	prompt(p, ship);
 	blockalarm();
-	(void) wrefresh(scroll_w);
+	wrefresh(scroll_w);
 	unblockalarm();
 	while ((c = wgetch(scroll_w)) == EOF)
 		;
 	if (flag && c >= ' ' && c < 0x7f)
-		(void) waddch(scroll_w, c);
+		waddch(scroll_w, c);
 	endprompt(flag);
 	return c;
 }
 
-sgetstr(pr, buf, n)
-char *pr;
-char *buf;
-int n;
+void
+sgetstr(const char *pr, char *buf, int n)
 {
 	int c;
 	char *p = buf;
@@ -214,7 +221,7 @@ int n;
 	for (;;) {
 		*p = 0;
 		blockalarm();
-		(void) wrefresh(scroll_w);
+		wrefresh(scroll_w);
 		unblockalarm();
 		while ((c = wgetch(scroll_w)) == EOF)
 			;
@@ -225,236 +232,248 @@ int n;
 			return;
 		case '\b':
 			if (p > buf) {
-				(void) waddstr(scroll_w, "\b \b");
+				waddstr(scroll_w, "\b \b");
 				p--;
 			}
 			break;
 		default:
 			if (c >= ' ' && c < 0x7f && p < buf + n - 1) {
 				*p++ = c;
-				(void) waddch(scroll_w, c);
+				waddch(scroll_w, c);
 			} else
-				(void) putchar(CTRL('g'));
+				putchar(CTRL('g'));
 		}
 	}
 }
 
-draw_screen()
+void
+draw_screen(void)
 {
 	draw_view();
 	draw_turn();
 	draw_stat();
 	draw_slot();
-	(void) wrefresh(scroll_w);		/* move the cursor */
+	wrefresh(scroll_w);		/* move the cursor */
 }
 
-draw_view()
+void
+draw_view(void)
 {
 	struct ship *sp;
 
-	(void) werase(view_w);
+	werase(view_w);
 	foreachship(sp) {
 		if (sp->file->dir
 		    && sp->file->row > viewrow
 		    && sp->file->row < viewrow + VIEW_Y
 		    && sp->file->col > viewcol
 		    && sp->file->col < viewcol + VIEW_X) {
-			(void) wmove(view_w, sp->file->row - viewrow,
+			wmove(view_w, sp->file->row - viewrow,
 				sp->file->col - viewcol);
-			(void) waddch(view_w, colours(sp));
-			(void) wmove(view_w,
+			waddch(view_w, colours(sp));
+			wmove(view_w,
 				sternrow(sp) - viewrow,
 				sterncol(sp) - viewcol);
-			(void) waddch(view_w, sterncolour(sp));
+			waddch(view_w, sterncolour(sp));
 		}
 	}
-	(void) wrefresh(view_w);
+	wrefresh(view_w);
 }
 
-draw_turn()
+void
+draw_turn(void)
 {
-	(void) wmove(turn_w, 0, 0);
-	(void) wprintw(turn_w, "%cTurn %d", dont_adjust?'*':'-', turn);
-	(void) wrefresh(turn_w);
+	wmove(turn_w, 0, 0);
+	wprintw(turn_w, "%cTurn %d", dont_adjust?'*':'-', turn);
+	wrefresh(turn_w);
 }
 
-draw_stat()
+void
+draw_stat(void)
 {
-	(void) wmove(stat_w, STAT_1, 0);
-	(void) wprintw(stat_w, "Points  %3d\n", mf->points);
-	(void) wprintw(stat_w, "Fouls    %2d\n", fouled(ms));
-	(void) wprintw(stat_w, "Grapples %2d\n", grappled(ms));
+	wmove(stat_w, STAT_1, 0);
+	wprintw(stat_w, "Points  %3d\n", mf->points);
+	wprintw(stat_w, "Fouls    %2d\n", fouled(ms));
+	wprintw(stat_w, "Grapples %2d\n", grappled(ms));
 
-	(void) wmove(stat_w, STAT_2, 0);
-	(void) wprintw(stat_w, "    0 %c(%c)\n",
+	wmove(stat_w, STAT_2, 0);
+	wprintw(stat_w, "    0 %c(%c)\n",
 		maxmove(ms, winddir + 3, -1) + '0',
 		maxmove(ms, winddir + 3, 1) + '0');
-	(void) waddstr(stat_w, "   \\|/\n");
-	(void) wprintw(stat_w, "   -^-%c(%c)\n",
+	waddstr(stat_w, "   \\|/\n");
+	wprintw(stat_w, "   -^-%c(%c)\n",
 		maxmove(ms, winddir + 2, -1) + '0',
 		maxmove(ms, winddir + 2, 1) + '0');
-	(void) waddstr(stat_w, "   /|\\\n");
-	(void) wprintw(stat_w, "    | %c(%c)\n",
+	waddstr(stat_w, "   /|\\\n");
+	wprintw(stat_w, "    | %c(%c)\n",
 		maxmove(ms, winddir + 1, -1) + '0',
 		maxmove(ms, winddir + 1, 1) + '0');
-	(void) wprintw(stat_w, "   %c(%c)\n",
+	wprintw(stat_w, "   %c(%c)\n",
 		maxmove(ms, winddir, -1) + '0',
 		maxmove(ms, winddir, 1) + '0');
 
-	(void) wmove(stat_w, STAT_3, 0);
-	(void) wprintw(stat_w, "Load  %c%c %c%c\n",
+	wmove(stat_w, STAT_3, 0);
+	wprintw(stat_w, "Load  %c%c %c%c\n",
 		loadname[mf->loadL], readyname(mf->readyL),
 		loadname[mf->loadR], readyname(mf->readyR));
-	(void) wprintw(stat_w, "Hull %2d\n", mc->hull);
-	(void) wprintw(stat_w, "Crew %2d %2d %2d\n",
+	wprintw(stat_w, "Hull %2d\n", mc->hull);
+	wprintw(stat_w, "Crew %2d %2d %2d\n",
 		mc->crew1, mc->crew2, mc->crew3);
-	(void) wprintw(stat_w, "Guns %2d %2d\n", mc->gunL, mc->gunR);
-	(void) wprintw(stat_w, "Carr %2d %2d\n", mc->carL, mc->carR);
-	(void) wprintw(stat_w, "Rigg %d %d %d ", mc->rig1, mc->rig2, mc->rig3);
+	wprintw(stat_w, "Guns %2d %2d\n", mc->gunL, mc->gunR);
+	wprintw(stat_w, "Carr %2d %2d\n", mc->carL, mc->carR);
+	wprintw(stat_w, "Rigg %d %d %d ", mc->rig1, mc->rig2, mc->rig3);
 	if (mc->rig4 < 0)
-		(void) waddch(stat_w, '-');
+		waddch(stat_w, '-');
 	else
-		(void) wprintw(stat_w, "%d", mc->rig4);
-	(void) wrefresh(stat_w);
+		wprintw(stat_w, "%d", mc->rig4);
+	wrefresh(stat_w);
 }
 
-draw_slot()
+void
+draw_slot(void)
 {
 	if (!boarding(ms, 0)) {
-		(void) mvwaddstr(slot_w, 0, 0, "   ");
-		(void) mvwaddstr(slot_w, 1, 0, "   ");
+		mvwaddstr(slot_w, 0, 0, "   ");
+		mvwaddstr(slot_w, 1, 0, "   ");
 	} else
-		(void) mvwaddstr(slot_w, 1, 0, "OBP");
+		mvwaddstr(slot_w, 1, 0, "OBP");
 	if (!boarding(ms, 1)) {
-		(void) mvwaddstr(slot_w, 2, 0, "   ");
-		(void) mvwaddstr(slot_w, 3, 0, "   ");
+		mvwaddstr(slot_w, 2, 0, "   ");
+		mvwaddstr(slot_w, 3, 0, "   ");
 	} else
-		(void) mvwaddstr(slot_w, 3, 0, "DBP");
+		mvwaddstr(slot_w, 3, 0, "DBP");
 
-	(void) wmove(slot_w, SLOT_Y-4, 0);
+	wmove(slot_w, SLOT_Y-4, 0);
 	if (mf->RH)
-		(void) wprintw(slot_w, "%dRH", mf->RH);
+		wprintw(slot_w, "%dRH", mf->RH);
 	else
-		(void) waddstr(slot_w, "   ");
-	(void) wmove(slot_w, SLOT_Y-3, 0);
+		waddstr(slot_w, "   ");
+	wmove(slot_w, SLOT_Y-3, 0);
 	if (mf->RG)
-		(void) wprintw(slot_w, "%dRG", mf->RG);
+		wprintw(slot_w, "%dRG", mf->RG);
 	else
-		(void) waddstr(slot_w, "   ");
-	(void) wmove(slot_w, SLOT_Y-2, 0);
+		waddstr(slot_w, "   ");
+	wmove(slot_w, SLOT_Y-2, 0);
 	if (mf->RR)
-		(void) wprintw(slot_w, "%dRR", mf->RR);
+		wprintw(slot_w, "%dRR", mf->RR);
 	else
-		(void) waddstr(slot_w, "   ");
+		waddstr(slot_w, "   ");
 
 #define Y	(SLOT_Y/2)
-	(void) wmove(slot_w, 7, 1);
-	(void) wprintw(slot_w,"%d", windspeed);
-	(void) mvwaddch(slot_w, Y, 0, ' ');
-	(void) mvwaddch(slot_w, Y, 2, ' ');
-	(void) mvwaddch(slot_w, Y-1, 0, ' ');
-	(void) mvwaddch(slot_w, Y-1, 1, ' ');
-	(void) mvwaddch(slot_w, Y-1, 2, ' ');
-	(void) mvwaddch(slot_w, Y+1, 0, ' ');
-	(void) mvwaddch(slot_w, Y+1, 1, ' ');
-	(void) mvwaddch(slot_w, Y+1, 2, ' ');
-	(void) wmove(slot_w, Y - dr[winddir], 1 - dc[winddir]);
+	wmove(slot_w, 7, 1);
+	wprintw(slot_w,"%d", windspeed);
+	mvwaddch(slot_w, Y, 0, ' ');
+	mvwaddch(slot_w, Y, 2, ' ');
+	mvwaddch(slot_w, Y-1, 0, ' ');
+	mvwaddch(slot_w, Y-1, 1, ' ');
+	mvwaddch(slot_w, Y-1, 2, ' ');
+	mvwaddch(slot_w, Y+1, 0, ' ');
+	mvwaddch(slot_w, Y+1, 1, ' ');
+	mvwaddch(slot_w, Y+1, 2, ' ');
+	wmove(slot_w, Y - dr[winddir], 1 - dc[winddir]);
 	switch (winddir) {
 	case 1:
 	case 5:
-		(void) waddch(slot_w, '|');
+		waddch(slot_w, '|');
 		break;
 	case 2:
 	case 6:
-		(void) waddch(slot_w, '/');
+		waddch(slot_w, '/');
 		break;
 	case 3:
 	case 7:
-		(void) waddch(slot_w, '-');
+		waddch(slot_w, '-');
 		break;
 	case 4:
 	case 8:
-		(void) waddch(slot_w, '\\');
+		waddch(slot_w, '\\');
 		break;
 	}
-	(void) mvwaddch(slot_w, Y + dr[winddir], 1 + dc[winddir], '+');
-	(void) wrefresh(slot_w);
+	mvwaddch(slot_w, Y + dr[winddir], 1 + dc[winddir], '+');
+	wrefresh(slot_w);
 }
 
-draw_board()
+void
+draw_board(void)
 {
 	int n;
 
-	(void) clear();
-	(void) werase(view_w);
-	(void) werase(slot_w);
-	(void) werase(scroll_w);
-	(void) werase(stat_w);
-	(void) werase(turn_w);
+	clear();
+	werase(view_w);
+	werase(slot_w);
+	werase(scroll_w);
+	werase(stat_w);
+	werase(turn_w);
 
 	sc_line = 0;
 
-	(void) move(BOX_T, BOX_L);
+	move(BOX_T, BOX_L);
 	for (n = 0; n < BOX_X; n++)
-		(void) addch('-');
-	(void) move(BOX_B, BOX_L);
+		addch('-');
+	move(BOX_B, BOX_L);
 	for (n = 0; n < BOX_X; n++)
-		(void) addch('-');
+		addch('-');
 	for (n = BOX_T+1; n < BOX_B; n++) {
-		(void) mvaddch(n, BOX_L, '|');
-		(void) mvaddch(n, BOX_R, '|');
+		mvaddch(n, BOX_L, '|');
+		mvaddch(n, BOX_R, '|');
 	}
-	(void) mvaddch(BOX_T, BOX_L, '+');
-	(void) mvaddch(BOX_T, BOX_R, '+');
-	(void) mvaddch(BOX_B, BOX_L, '+');
-	(void) mvaddch(BOX_B, BOX_R, '+');
-	(void) refresh();
+	mvaddch(BOX_T, BOX_L, '+');
+	mvaddch(BOX_T, BOX_R, '+');
+	mvaddch(BOX_B, BOX_L, '+');
+	mvaddch(BOX_B, BOX_R, '+');
+	refresh();
 
 #define WSaIM "Wooden Ships & Iron Men"
-	(void) wmove(view_w, 2, (VIEW_X - sizeof WSaIM - 1) / 2);
-	(void) waddstr(view_w, WSaIM);
-	(void) wmove(view_w, 4, (VIEW_X - strlen(cc->name)) / 2);
-	(void) waddstr(view_w, cc->name);
-	(void) wrefresh(view_w);
+	wmove(view_w, 2, (VIEW_X - sizeof WSaIM - 1) / 2);
+	waddstr(view_w, WSaIM);
+	wmove(view_w, 4, (VIEW_X - strlen(cc->name)) / 2);
+	waddstr(view_w, cc->name);
+	wrefresh(view_w);
 
-	(void) move(LINE_T, LINE_L);
-	(void) printw("Class %d %s (%d guns) '%s' (%c%c)",
+	move(LINE_T, LINE_L);
+	printw("Class %d %s (%d guns) '%s' (%c%c)",
 		mc->class,
 		classname[mc->class],
 		mc->guns,
 		ms->shipname,
 		colours(ms),
 		sterncolour(ms));
-	(void) refresh();
+	refresh();
 }
 
-centerview()
+void
+centerview(void)
 {
 	viewrow = mf->row - VIEW_Y / 2;
 	viewcol = mf->col - VIEW_X / 2;
 }
 
-upview()
+void
+upview(void)
 {
 	viewrow -= VIEW_Y / 3;
 }
 
-downview()
+void
+downview(void)
 {
 	viewrow += VIEW_Y / 3;
 }
 
-leftview()
+void
+leftview(void)
 {
 	viewcol -= VIEW_X / 5;
 }
 
-rightview()
+void
+rightview(void)
 {
 	viewcol += VIEW_X / 5;
 }
 
-adjustview()
+static void
+adjustview(void)
 {
 	if (dont_adjust)
 		return;