- 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 7cfe13bac2db665ab0067ab6016d652e130e7191..43e944167860f452d7ba38280953b9a4ac9d7c37 100644 (file)
--- a/sail/parties.c
+++ b/sail/parties.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $  */
+/*     $NetBSD: parties.c,v 1.12 2009/03/14 22:52:52 dholland Exp $    */

 
 /*
  * Copyright (c) 1983, 1993
 
 /*
  * 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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -33,22 +29,23 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #if 0
 #ifndef lint
 #if 0

-static char sccsid[] = "@(#)parties.c  8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)parties.c  8.2 (Berkeley) 4/28/95";

 #else
 #else

-static char rcsid[] = "$NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $";
+__RCSID("$NetBSD: parties.c,v 1.12 2009/03/14 22:52:52 dholland Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 

-#include "externs.h"
+#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)
 
        for (; p < q; p++)
                if (p->turnsent && p->toship == to)


@@ -56,12 +53,11 @@ register struct ship *to;
        return 0;
 }
 
        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)
 
        for (; p < q; p++)
                if (p->turnsent)


@@ -69,14 +65,20 @@ char isdefense;
        return 0;
 }
 
        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);
+                       }
+               }
+       }

 }
 }