X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/57a75ab7b9a0f4999cae7c0fa5acb46f230f38f2..7890a8c64a29e8f0ee5b9b2ef41a118f9ac499bd:/sail/dr_4.c

diff --git a/sail/dr_4.c b/sail/dr_4.c
index 1738f149..db45a258 100644
--- a/sail/dr_4.c
+++ b/sail/dr_4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_4.c,v 1.8 2000/11/30 22:02:20 jwise Exp $	*/
+/*	$NetBSD: dr_4.c,v 1.15 2009/03/14 22:52:52 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,16 +34,15 @@
 #if 0
 static char sccsid[] = "@(#)dr_4.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dr_4.c,v 1.8 2000/11/30 22:02:20 jwise Exp $");
+__RCSID("$NetBSD: dr_4.c,v 1.15 2009/03/14 22:52:52 dholland Exp $");
 #endif
 #endif /* not lint */
 
-#include "extern.h"
 #include <stdlib.h>
+#include "extern.h"
 
 void
-ungrap(from, to)
-struct ship *from, *to;
+ungrap(struct ship *from, struct ship *to)
 {
 	int k;
 	char friend;
@@ -64,12 +59,12 @@ struct ship *from, *to;
 }
 
 void
-grap(from, to)
-struct ship *from, *to;
+grap(struct ship *from, struct ship *to)
 {
-	if (capship(from)->nationality != capship(to)->nationality && dieroll() > 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);
+	send_grap(from, to->file->index);
+	send_grap(to, from->file->index);
 	makesignal(from, "grappled with $$", to);
 }