X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/378015332508b48169d5f735be9a4bb4b6c82c03..4c2fca22580ba0ae4ec901cca158c5e228494265:/sail/dr_2.c

diff --git a/sail/dr_2.c b/sail/dr_2.c
index 460f24ff..40a24839 100644
--- a/sail/dr_2.c
+++ b/sail/dr_2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_2.c,v 1.24 2009/03/14 20:04:43 dholland Exp $	*/
+/*	$NetBSD: dr_2.c,v 1.27 2019/02/03 10:48:46 mrg 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.24 2009/03/14 20:04:43 dholland Exp $");
+__RCSID("$NetBSD: dr_2.c,v 1.27 2019/02/03 10:48:46 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -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);
 		}
 	}
 }
@@ -249,7 +252,7 @@ try(struct ship *f, struct ship *t,
     int ma, int ta, bool af, int vma, int dir, int *high, int rakeme)
 {
 	int new, n;
-	char st[4];
+	char st[11];
 #define rakeyou (gunsbear(f, t) && !gunsbear(t, f))
 
 	if ((n = str_end(temp)) < '1' || n > '9')
@@ -283,7 +286,7 @@ try(struct ship *f, struct ship *t,
 	}
 	if ((ma > 0 && ta > 0 && (n = str_end(temp)) != 'l' && n != 'r') ||
 	    !strlen(temp)) {
-		strlcat(temp, "l", sizeof(temp));
+		strlcat(temp, "l", tempmax);
 		new = score(f, t, temp, tempmax, rakeme);
 		if (new > *high && (!rakeme ||
 				    (gunsbear(f, t) && !gunsbear(t, f)))) {