- for readability when the exponent < 10 don't prefix it with 0x (from kre)

[bsdgames-darwin.git] / sail / parties.c

diff --git a/sail/parties.c b/sail/parties.c
index 3db054c3120d8e2ec85614841ef4fd7d692b9f88..43e944167860f452d7ba38280953b9a4ac9d7c37 100644 (file)
--- a/sail/parties.c
+++ b/sail/parties.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: parties.c,v 1.5 1997/10/13 19:44:47 christos 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.
  *
@@ -38,16 +34,15 @@
 #if 0
 static char sccsid[] = "@(#)parties.c  8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: parties.c,v 1.5 1997/10/13 19:44:47 christos 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"
 
 int
-meleeing(from, to)
-struct ship *from;
-struct ship *to;
+meleeing(struct ship *from, struct ship *to)
 {
        struct BP *p = from->file->OBP;
        struct BP *q = p + NBP;
@@ -59,9 +54,7 @@ struct ship *to;
 }
 
 int
-boarding(from, isdefense)
-struct ship *from;
-char isdefense;
+boarding(struct ship *from, int isdefense)
 {
        struct BP *p = isdefense ? from->file->DBP : from->file->OBP;
        struct BP *q = p + NBP;
@@ -73,14 +66,19 @@ char isdefense;
 }
 
 void
-unboard(ship, to, isdefense)
-struct ship *ship, *to;
-char isdefense;
+unboard(struct ship *ship, struct ship *to, int isdefense)
 {
        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);
+                       }
+               }
+       }
 }