BSD 4_4 release

[unix-history] / usr / src / games / sail / parties.c

diff --git a/usr/src/games/sail/parties.c b/usr/src/games/sail/parties.c
index 5a1824c..c6151e3 100644 (file)
--- a/usr/src/games/sail/parties.c
+++ b/usr/src/games/sail/parties.c
@@ -1,65 +1,76 @@
+/*
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)parties.c   1.1 83/03/17";
-#endif
+static char sccsid[] = "@(#)parties.c  8.1 (Berkeley) 5/31/93";
+#endif /* not lint */
+

 #include "externs.h"
 
 meleeing(from, to)
 #include "externs.h"
 
 meleeing(from, to)

-int from, to;
+struct ship *from;
+register struct ship *to;

 {
 {

-    register int n;
+       register struct BP *p = from->file->OBP;
+       register struct BP *q = p + NBP;

 
 

-    for (n = 0; n < 3; n++)
-       {
-       if (scene[game].ship[from].file -> OBP[n].turnsent && scene[game].ship[from].file -> OBP[n].toship == to)
-           return(1);
-       }
-    return(0);
+       for (; p < q; p++)
+               if (p->turnsent && p->toship == to)
+                       return 1;
+       return 0;

 }
 
 }
 

-Fouled(shipnum, offset)
-int shipnum, offset;
-{
-    register int n, Fouls = 0;
-    struct snag *ptr;
-
-    ptr = offset == 342 ? scene[game].ship[shipnum].file -> fouls : scene[game].ship[shipnum].file -> grapples ;
-    for (n=0; n < 10; n++){
-       if (ptr[n].turnfoul)
-           Fouls++;
-    }
-    return(Fouls);
-}
-
-
-Grapple(shipnum, toship, offset)
-int shipnum, toship, offset;
+boarding(from, isdefense)
+register struct ship *from;
+char isdefense;

 {
 {

-    int test = 0;
-    register int n, Fouls = 0;
-    struct snag *ptr;
+       register struct BP *p = isdefense ? from->file->DBP : from->file->OBP;
+       register struct BP *q = p + NBP;

 
 

-    if (shipnum >= 100)
-       {
-       shipnum -= 100;
-       test = 1;
-       }
-    ptr = offset == 342 ? scene[game].ship[shipnum].file -> fouls : scene[game].ship[shipnum].file -> grapples ;
-    for (n=0; n < 10; n++)
-       {
-       if (ptr[n].turnfoul && ptr[n].toship == toship && (!test || (ptr[n].turnfoul < turn - 1 && (loadwith[shipnum] = GRAPE))))
-           Fouls++;
-       }
-    return(Fouls);
+       for (; p < q; p++)
+               if (p->turnsent)
+                       return 1;
+       return 0;

 }
 
 }
 

-unboard(shipnum, toship, defense)
-int shipnum, toship, defense;
+unboard(ship, to, isdefense)
+register struct ship *ship, *to;
+register char isdefense;

 {
 {

-    register int n;
-    struct BP *ptr;
+       register struct BP *p = isdefense ? ship->file->DBP : ship->file->OBP;
+       register n;

 
 

-    ptr = defense ? scene[game].ship[shipnum].file -> DBP : scene[game].ship[shipnum].file -> OBP ; 
-    for (n=0; n < 3; n++)
-       if (ptr[n].turnsent && (ptr[n].toship == toship || defense || shipnum == toship))
-           Write(FILES + shipnum, 0, 30 + 18*defense + 6*n, 0);
+       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);

 }
 }