From 13ed27c1ac224e3cd08385be743ebfffd8341bdc Mon Sep 17 00:00:00 2001
From: marcel <marcel@FreeBSD.org>
Date: Tue, 16 Nov 1999 12:10:29 +0000
Subject: [PATCH] Fix breakage in previous commit.

---
 games/sail/dr_1.c    |  4 ++--
 games/sail/dr_3.c    |  2 +-
 games/sail/dr_4.c    |  2 +-
 games/sail/misc.c    | 12 ++++++------
 games/sail/parties.c |  2 +-
 games/sail/pl_3.c    |  2 +-
 games/sail/pl_6.c    |  2 +-
 games/sail/pl_7.c    |  6 +++---
 games/sail/sync.c    |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/games/sail/dr_1.c b/games/sail/dr_1.c
index 00311fb7ccef..9874a0aadc64 100644
--- a/games/sail/dr_1.c
+++ b/games/sail/dr_1.c
@@ -44,7 +44,7 @@ unfoul()
 	struct ship *sp;
 	struct ship *to;
 	int nat;
-	i;
+	int i;
 
 	foreachship(sp) {
 		if (sp->file->captain[0])
@@ -258,7 +258,7 @@ resolve()
 
 compcombat()
 {
-	n;
+	int n;
 	struct ship *sp;
 	struct ship *closest;
 	int crew[3], men = 0, target, temp;
diff --git a/games/sail/dr_3.c b/games/sail/dr_3.c
index 55654574c82b..f08014d38fcf 100644
--- a/games/sail/dr_3.c
+++ b/games/sail/dr_3.c
@@ -283,7 +283,7 @@ struct ship *ship, *to;
 int isdefense, count;
 {
 	struct BP *bp;
-	obp = 0;
+	int obp = 0;
 	int n, OBP = 0, DBP = 0, dbp = 0;
 	int qual;
 
diff --git a/games/sail/dr_4.c b/games/sail/dr_4.c
index 1442a9d16cb5..df77cb61a0db 100644
--- a/games/sail/dr_4.c
+++ b/games/sail/dr_4.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)dr_4.c	8.1 (Berkeley) 5/31/93";
 ungrap(from, to)
 struct ship *from, *to;
 {
-	k;
+	int k;
 	char friend;
 
 	if ((k = grappled2(from, to)) == 0)
diff --git a/games/sail/misc.c b/games/sail/misc.c
index 56dc3c2ec46f..5e57a23ffc34 100644
--- a/games/sail/misc.c
+++ b/games/sail/misc.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 range(from, to)
 struct ship *from, *to;
 {
-	bow1r, bow1c, bow2r, bow2c;
+	int bow1r, bow1c, bow2r, bow2c;
 	int stern1r, stern1c, stern2c, stern2r;
 	int bb, bs, sb, ss, result;
 
@@ -100,9 +100,9 @@ char side, anyship;
 }
 
 angle(dr, dc)
-dr, dc;
+int dr, dc;
 {
-	i;
+	int i;
 
 	if (dc >= 0 && dr > 0)
 		i = 0;
@@ -130,7 +130,7 @@ gunsbear(from, to)		/* checks for target bow or stern */
 struct ship *from, *to;
 {
 	int Dr, Dc, i;
-	ang;
+	int ang;
 
 	Dr = from->file->row - to->file->row;
 	Dc = to->file->col - from->file->col;
@@ -151,8 +151,8 @@ portside(from, on, quick)
 struct ship *from, *on;
 int quick;			/* returns true if fromship is */
 {				/* shooting at onship's starboard side */
-	ang;
-	Dr, Dc;
+	int ang;
+	int Dr, Dc;
 
 	Dr = from->file->row - on->file->row;
 	Dc = on->file->col - from->file->col;
diff --git a/games/sail/parties.c b/games/sail/parties.c
index 250b1a064d5d..f3d5061a654b 100644
--- a/games/sail/parties.c
+++ b/games/sail/parties.c
@@ -70,7 +70,7 @@ struct ship *ship, *to;
 char isdefense;
 {
 	struct BP *p = isdefense ? ship->file->DBP : ship->file->OBP;
-	n;
+	int n;
 
 	for (n = 0; n < NBP; p++, n++)
 		if (p->turnsent && (p->toship == to || isdefense || ship == to))
diff --git a/games/sail/pl_3.c b/games/sail/pl_3.c
index 26591f21a2b0..d4e79e9f25eb 100644
--- a/games/sail/pl_3.c
+++ b/games/sail/pl_3.c
@@ -259,7 +259,7 @@ grapungrap()
 unfoulplayer()
 {
 	struct ship *to;
-	i;
+	int i;
 
 	foreachship(to) {
 		if (fouled2(ms, to) == 0)
diff --git a/games/sail/pl_6.c b/games/sail/pl_6.c
index 19ecc0704433..6d30f7262e4e 100644
--- a/games/sail/pl_6.c
+++ b/games/sail/pl_6.c
@@ -145,7 +145,7 @@ turned()
 loadplayer()
 {
 	char c;
-	loadL, loadR, ready, load;
+	int loadL, loadR, ready, load;
 
 	if (!mc->crew3) {
 		Signal("Out of crew", (struct ship *)0);
diff --git a/games/sail/pl_7.c b/games/sail/pl_7.c
index e3bdcb2664d1..1de3141c715f 100644
--- a/games/sail/pl_7.c
+++ b/games/sail/pl_7.c
@@ -189,7 +189,7 @@ char *p;
 struct ship *ship;
 char flag;
 {
-	c;
+	int c;
 
 	prompt(p, ship);
 	blockalarm();
@@ -206,9 +206,9 @@ char flag;
 sgetstr(pr, buf, n)
 char *pr;
 char *buf;
-n;
+int n;
 {
-	c;
+	int c;
 	char *p = buf;
 
 	prompt(pr, (struct ship *)0);
diff --git a/games/sail/sync.c b/games/sail/sync.c
index 389009103bb2..81117b62a16c 100644
--- a/games/sail/sync.c
+++ b/games/sail/sync.c
@@ -141,7 +141,7 @@ Write(type, ship, isstr, a, b, c, d)
 Sync()
 {
 	sig_t sighup, sigint;
-	n;
+	int n;
 	int type, shipnum, isstr, a, b, c, d;
 	char buf[80];
 	char erred = 0;