X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/fdc664b7bf17e7162301f1d0354f0094af2b08e5..472fbbd5937eec7a8eb7a9c9a53f23ebff28e8f6:/sail/dr_2.c

diff --git a/sail/dr_2.c b/sail/dr_2.c
index 56719fbd..a761fb1d 100644
--- a/sail/dr_2.c
+++ b/sail/dr_2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_2.c,v 1.23 2009/03/14 19:35:13 dholland Exp $	*/
+/*	$NetBSD: dr_2.c,v 1.25 2009/03/14 22:52:52 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dr_2.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dr_2.c,v 1.23 2009/03/14 19:35:13 dholland Exp $");
+__RCSID("$NetBSD: dr_2.c,v 1.25 2009/03/14 22:52:52 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,7 @@ static void move_ship(struct ship *, const char *, unsigned char *,
 		      short *, short *, int *);
 static void try(struct ship *f, struct ship *t,
 		char *command, size_t commandmax, char *temp, size_t tempmax,
-		int ma, int ta, int af, int vma, int dir, int *high,
+		int ma, int ta, bool af, int vma, int dir, int *high,
 		int rakeme);
 static void rmend(char *);
 
@@ -105,8 +105,12 @@ checkup(void)
 			continue;
 		if (dieroll() < 5)
 			continue;
-		Write(sink == 1 ? W_SINK : W_EXPLODE, sp, 2, 0, 0, 0);
-		Write(W_DIR, sp, 0, 0, 0, 0);
+		if (sink == 1) {
+			send_sink(sp, 2);
+		} else {
+			send_explode(sp, 2);
+		}
+		send_dir(sp, 0);
 		if (snagged(sp))
 			foreachship(sq)
 				cleansnag(sp, sq, 1);
@@ -136,12 +140,11 @@ prizecheck(void)
 			continue;
 		if (sp->specs->crew1 + sp->specs->crew2 + sp->specs->crew3 >
 		    sp->file->pcrew * 6) {
-			Writestr(W_SIGNAL, sp, "prize crew overthrown");
-			Write(W_POINTS, sp->file->captured,
+			send_signal(sp, "prize crew overthrown");
+			send_points(sp->file->captured,
 			      sp->file->captured->file->points
-			        - 2 * sp->specs->pts,
-			      0, 0, 0);
-			Write(W_CAPTURED, sp, -1, 0, 0, 0);
+				- 2 * sp->specs->pts);
+			send_captured(sp, -1);
 		}
 	}
 }
@@ -158,7 +161,7 @@ str_end(const char *str)
 
 void
 closeon(struct ship *from, struct ship *to, char *command, size_t commandmax,
-	int ta, int ma, int af)
+	int ta, int ma, bool af)
 {
 	int high;
 	char temp[10];
@@ -246,7 +249,7 @@ static void
 try(struct ship *f, struct ship *t,
     char *command, size_t commandmax,
     char *temp, size_t tempmax,
-    int ma, int ta, int af, int vma, int dir, int *high, int rakeme)
+    int ma, int ta, bool af, int vma, int dir, int *high, int rakeme)
 {
 	int new, n;
 	char st[4];