X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/ff661413fe2d73ce048a4c6a1f36601ae5d1f411..a4d00d5b72c57ebc93b5b96dc673894fe97cd0e7:/sail/parties.c

diff --git a/sail/parties.c b/sail/parties.c
index 3fa8c182..43e94416 100644
--- a/sail/parties.c
+++ b/sail/parties.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parties.c,v 1.4 1997/01/07 12:42:23 tls Exp $	*/
+/*	$NetBSD: parties.c,v 1.12 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.
  *
@@ -33,22 +29,23 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parties.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$NetBSD: parties.c,v 1.4 1997/01/07 12:42:23 tls Exp $";
+__RCSID("$NetBSD: parties.c,v 1.12 2009/03/14 22:52:52 dholland Exp $");
 #endif
 #endif /* not lint */
 
+#include <sys/types.h>
 #include "extern.h"
 
-meleeing(from, to)
-struct ship *from;
-register struct ship *to;
+int
+meleeing(struct ship *from, struct ship *to)
 {
-	register struct BP *p = from->file->OBP;
-	register struct BP *q = p + NBP;
+	struct BP *p = from->file->OBP;
+	struct BP *q = p + NBP;
 
 	for (; p < q; p++)
 		if (p->turnsent && p->toship == to)
@@ -56,12 +53,11 @@ register struct ship *to;
 	return 0;
 }
 
-boarding(from, isdefense)
-register struct ship *from;
-char isdefense;
+int
+boarding(struct ship *from, int isdefense)
 {
-	register struct BP *p = isdefense ? from->file->DBP : from->file->OBP;
-	register struct BP *q = p + NBP;
+	struct BP *p = isdefense ? from->file->DBP : from->file->OBP;
+	struct BP *q = p + NBP;
 
 	for (; p < q; p++)
 		if (p->turnsent)
@@ -69,14 +65,20 @@ char isdefense;
 	return 0;
 }
 
-unboard(ship, to, isdefense)
-register struct ship *ship, *to;
-register char isdefense;
+void
+unboard(struct ship *ship, struct ship *to, int isdefense)
 {
-	register struct BP *p = isdefense ? ship->file->DBP : ship->file->OBP;
-	register n;
+	struct BP *p = isdefense ? ship->file->DBP : ship->file->OBP;
+	int n;
 
-	for (n = 0; n < NBP; p++, n++)
-		if (p->turnsent && (p->toship == to || isdefense || ship == to))
-			Write(isdefense ? W_DBP : W_OBP, ship, 0, n, 0, 0, 0);
+	for (n = 0; n < NBP; p++, n++) {
+		if (p->turnsent &&
+		    (p->toship == to || isdefense || ship == to)) {
+			if (isdefense) {
+				send_dbp(ship, n, 0, 0, 0);
+			} else {
+				send_obp(ship, n, 0, 0, 0);
+			}
+		}
+	}
 }