BSD 4_3_Tahoe release

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

diff --git a/usr/src/games/sail/dr_4.c b/usr/src/games/sail/dr_4.c
index 6cb77f6..8e73d1f 100644 (file)
--- a/usr/src/games/sail/dr_4.c
+++ b/usr/src/games/sail/dr_4.c
@@ -1,21 +1,38 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)dr_4.c      1.2 83/07/20";
-#endif
+static char sccsid[] = "@(#)dr_4.c     5.3 (Berkeley) 6/18/88";
+#endif /* not lint */
+

 #include "externs.h"
 
 ungrap(from, to)
 register struct ship *from, *to;
 {
        register k;
 #include "externs.h"
 
 ungrap(from, to)
 register struct ship *from, *to;
 {
        register k;

-       register struct snag *sp = from->file->grapples;
+       char friend;

 
 

-       if (grappled2(from, to)) {
-               for (k = 0; k < NSHIP; k++, sp++) {
-                       if (sp->turnfoul == 0 || to != sp->toship)
-                               continue;
-                       if (from->nationality == to->nationality && die() >= 3)
-                               continue;
-                       cleangrapple(from, to, k);
+       if ((k = grappled2(from, to)) == 0)
+               return;
+       friend = capship(from)->nationality == capship(to)->nationality;
+       while (--k >= 0) {
+               if (friend || die() < 3) {
+                       cleangrapple(from, to, 0);

                        makesignal(from, "ungrappling %s (%c%c)", to);
                }
        }
                        makesignal(from, "ungrappling %s (%c%c)", to);
                }
        }


@@ -24,17 +41,9 @@ register struct ship *from, *to;
 grap(from, to)
 register struct ship *from, *to;
 {
 grap(from, to)
 register struct ship *from, *to;
 {

-       register l;
-
-       if (from->nationality != capship(to)->nationality && die() >= 3)
+       if (capship(from)->nationality != capship(to)->nationality && die() > 2)

                return;
                return;

-       for (l = 0; l < NSHIP && from->file->grapples[l].turnfoul; l++)
-               ;
-       if (l < NSHIP)
-               Write(W_GRAP, from, 0, l, turn, to-SHIP(0), 0);
-       for (l = 0; l < NSHIP && to->file->grapples[l].turnfoul; l++)
-               ;
-       if (l < NSHIP)
-               Write(W_GRAP, to, 0, l, turn, from-SHIP(0), 0);
+       Write(W_GRAP, from, 0, to->file->index, 0, 0, 0);
+       Write(W_GRAP, to, 0, from->file->index, 0, 0, 0);

        makesignal(from, "grappled with %s (%c%c)", to);
 }
        makesignal(from, "grappled with %s (%c%c)", to);
 }