Change the macro to roll a six-sided die from die() to dieroll() (for

obvious reasons of convention).

8 files changed, 32 insertions, 33 deletions

diff --git a/sail/assorted.c b/sail/assorted.c
index 5101a207..8bd2bec7 100644
--- a/sail/assorted.c
+++ b/sail/assorted.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: assorted.c,v 1.8 1999/09/08 21:17:58 jsm Exp $	*/
+/*	$NetBSD: assorted.c,v 1.9 2000/11/30 22:02:20 jwise Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)assorted.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: assorted.c,v 1.8 1999/09/08 21:17:58 jsm Exp $");
+__RCSID("$NetBSD: assorted.c,v 1.9 2000/11/30 22:02:20 jwise Exp $");
 #endif
 #endif /* not lint */
 
@@ -283,7 +283,7 @@ struct ship *ship, *from;
 	Write(W_POINTS, from, points, 0, 0, 0);
 	unboard(ship, ship, 0);		/* all offense */
 	unboard(ship, ship, 1);		/* all defense */
-	switch (die()) {
+	switch (dieroll()) {
 	case 3:
 	case 4:		/* ship may sink */
 		Write(W_SINK, ship, 1, 0, 0, 0);
diff --git a/sail/dr_1.c b/sail/dr_1.c
index 3395deec..9437c8b6 100644
--- a/sail/dr_1.c
+++ b/sail/dr_1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_1.c,v 1.10 1999/09/30 18:01:33 jsm Exp $	*/
+/*	$NetBSD: dr_1.c,v 1.11 2000/11/30 22:02:20 jwise Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dr_1.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dr_1.c,v 1.10 1999/09/30 18:01:33 jsm Exp $");
+__RCSID("$NetBSD: dr_1.c,v 1.11 2000/11/30 22:02:20 jwise Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,7 +62,7 @@ unfoul()
 			    !is_toughmelee(sp, to, 0, 0))
 				continue;
 			for (i = fouled2(sp, to); --i >= 0;)
-				if (die() <= 2)
+				if (dieroll() <= 2)
 					cleanfoul(sp, to, 0);
 		}
 	}
@@ -173,12 +173,12 @@ int key;
 		index = fromstrength/10;
 		if (index > 8)
 			index = 8;
-		toinjured = MT[index][2 - die() / 3];
+		toinjured = MT[index][2 - dieroll() / 3];
 		totalto += toinjured;
 		index = strengthto/10;
 		if (index > 8)
 			index = 8;
-		frominjured = MT[index][2 - die() / 3];
+		frominjured = MT[index][2 - dieroll() / 3];
 		totalfrom += frominjured;
 		menfrom -= frominjured;
 		mento -= toinjured;
@@ -392,7 +392,7 @@ compcombat()
 			if (hit >= 0) {
 				if (load != L_GRAPE)
 					hit = hit > 10 ? 10 : hit;
-				table(shootat, load, hit, closest, sp, die());
+				table(shootat, load, hit, closest, sp, dieroll());
 			}
 		}
 	}
@@ -439,8 +439,8 @@ next()
 		return -1;
 	}
 	Write(W_TURN, SHIP(0), turn, 0, 0, 0);
-	if (turn % 7 == 0 && (die() >= cc->windchange || !windspeed)) {
-		switch (die()) {
+	if (turn % 7 == 0 && (dieroll() >= cc->windchange || !windspeed)) {
+		switch (dieroll()) {
 		case 1:
 			winddir = 1;
 			break;
@@ -464,7 +464,7 @@ next()
 		if (winddir < 1)
 			winddir += 8;
 		if (windspeed)
-			switch (die()) {
+			switch (dieroll()) {
 			case 1:
 			case 2:
 				windspeed--;
diff --git a/sail/dr_2.c b/sail/dr_2.c
index ad0a5e4d..13366a98 100644
--- a/sail/dr_2.c
+++ b/sail/dr_2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_2.c,v 1.11 1999/09/30 18:01:33 jsm Exp $	*/
+/*	$NetBSD: dr_2.c,v 1.12 2000/11/30 22:02:20 jwise Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dr_2.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dr_2.c,v 1.11 1999/09/30 18:01:33 jsm Exp $");
+__RCSID("$NetBSD: dr_2.c,v 1.12 2000/11/30 22:02:20 jwise Exp $");
 #endif
 #endif /* not lint */
 
@@ -91,7 +91,7 @@ checkup()
 		sink = sp->file->sink;
 		if (explode != 1 && sink != 1)
 			continue;
-		if (die() < 5)
+		if (dieroll() < 5)
 			continue;
 		Write(sink == 1 ? W_SINK : W_EXPLODE, sp, 2, 0, 0, 0);
 		Write(W_DIR, sp, 0, 0, 0, 0);
diff --git a/sail/dr_3.c b/sail/dr_3.c
index 77a83ede..a1e893b6 100644
--- a/sail/dr_3.c
+++ b/sail/dr_3.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_3.c,v 1.7 1999/09/30 18:01:33 jsm Exp $	*/
+/*	$NetBSD: dr_3.c,v 1.8 2000/11/30 22:02:20 jwise Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dr_3.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dr_3.c,v 1.7 1999/09/30 18:01:33 jsm Exp $");
+__RCSID("$NetBSD: dr_3.c,v 1.8 2000/11/30 22:02:20 jwise Exp $");
 #endif
 #endif /* not lint */
 
@@ -135,7 +135,7 @@ moveall()		/* move all comp ships */
 					snap++;
 				if (!range(sp, sq) && !fouled2(sp, sq)) {
 					makesignal(sp, "collision with $$", sq);
-					if (die() < 4) {
+					if (dieroll() < 4) {
 						makesignal(sp, "fouled with $$",
 						    sq);
 						Write(W_FOUL, sp, l, 0, 0, 0);
diff --git a/sail/dr_4.c b/sail/dr_4.c
index 336bdcf5..1738f149 100644
--- a/sail/dr_4.c
+++ b/sail/dr_4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_4.c,v 1.7 1999/02/10 00:45:45 hubertf Exp $	*/
+/*	$NetBSD: dr_4.c,v 1.8 2000/11/30 22:02:20 jwise Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dr_4.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dr_4.c,v 1.7 1999/02/10 00:45:45 hubertf Exp $");
+__RCSID("$NetBSD: dr_4.c,v 1.8 2000/11/30 22:02:20 jwise Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,7 +56,7 @@ struct ship *from, *to;
 		return;
 	friend = capship(from)->nationality == capship(to)->nationality;
 	while (--k >= 0) {
-		if (friend || die() < 3) {
+		if (friend || dieroll() < 3) {
 			cleangrapple(from, to, 0);
 			makesignal(from, "ungrappling $$", to);
 		}
@@ -67,7 +67,7 @@ void
 grap(from, to)
 struct ship *from, *to;
 {
-	if (capship(from)->nationality != capship(to)->nationality && die() > 2)
+	if (capship(from)->nationality != capship(to)->nationality && dieroll() > 2)
 		return;
 	Write(W_GRAP, from, to->file->index, 0, 0, 0);
 	Write(W_GRAP, to, from->file->index, 0, 0, 0);
diff --git a/sail/extern.h b/sail/extern.h
index e9a6560f..4d247370 100644
--- a/sail/extern.h
+++ b/sail/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.15 2000/11/30 21:50:58 jwise Exp $ */
+/*	$NetBSD: extern.h,v 1.16 2000/11/30 22:02:20 jwise Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -60,7 +60,7 @@ extern char nobells;			/* -b, don't ring bell before Signal */
 extern gid_t gid;
 extern gid_t egid;
 
-#define die()		((rand() >> 3) % 6 + 1)
+#define dieroll()		((rand() >> 3) % 6 + 1)
 #define sqr(a)		((a) * (a))
 #define abs(a)		((a) > 0 ? (a) : -(a))
 #define min(a,b)	((a) < (b) ? (a) : (b))
diff --git a/sail/main.c b/sail/main.c
index d6a3e948..5db425de 100644
--- a/sail/main.c
+++ b/sail/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.10 2000/11/30 21:38:57 jwise Exp $	*/
+/*	$NetBSD: main.c,v 1.11 2000/11/30 22:02:20 jwise Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.10 2000/11/30 21:38:57 jwise Exp $");
+__RCSID("$NetBSD: main.c,v 1.11 2000/11/30 22:02:20 jwise Exp $");
 #endif
 #endif /* not lint */
 
@@ -55,7 +55,6 @@ __RCSID("$NetBSD: main.c,v 1.10 2000/11/30 21:38:57 jwise Exp $");
 
 int main (int, char **);
 
-/*ARGSUSED*/
 int
 main(int argc, char **argv)
 {
diff --git a/sail/pl_3.c b/sail/pl_3.c
index be5cbb21..9b476f6c 100644
--- a/sail/pl_3.c
+++ b/sail/pl_3.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pl_3.c,v 1.8 1999/09/08 21:17:59 jsm Exp $	*/
+/*	$NetBSD: pl_3.c,v 1.9 2000/11/30 22:02:20 jwise Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_3.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_3.c,v 1.8 1999/09/08 21:17:59 jsm Exp $");
+__RCSID("$NetBSD: pl_3.c,v 1.9 2000/11/30 22:02:20 jwise Exp $");
 #endif
 #endif /* not lint */
 
@@ -177,7 +177,7 @@ acceptcombat()
 		if (windspeed == 6 && temp <= 3)
 			hit--;
 		if (hit >= 0) {
-			roll = die();
+			roll = dieroll();
 			if (load == L_GRAPE)
 				chits = hit;
 			else {
@@ -232,7 +232,7 @@ grapungrap()
 		switch (sgetch("Attempt to grapple or ungrapple $$: ",
 			sp, 1)) {
 		case 'g':
-			if (die() < 3
+			if (dieroll() < 3
 			    || ms->nationality == capship(sp)->nationality) {
 				Write(W_GRAP, ms, sp->file->index, 0, 0, 0);
 				Write(W_GRAP, sp, player, 0, 0, 0);
@@ -245,7 +245,7 @@ grapungrap()
 			for (i = grappled2(ms, sp); --i >= 0;) {
 				if (ms->nationality
 					== capship(sp)->nationality
-				    || die() < 3) {
+				    || dieroll() < 3) {
 					cleangrapple(ms, sp, 0);
 					Msg("Attempt succeeds!");
 					makesignal(ms, "ungrappling with $$",
@@ -270,7 +270,7 @@ unfoulplayer()
 		if (sgetch("Attempt to unfoul with the $$? ", to, 1) != 'y')
 			continue;
 		for (i = fouled2(ms, to); --i >= 0;) {
-			if (die() <= 2) {
+			if (dieroll() <= 2) {
 				cleanfoul(ms, to, 0);
 				Msg("Attempt succeeds!");
 				makesignal(ms, "Unfouling $$", to);