Rework curses handling.

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

diff --git a/sail/dr_4.c b/sail/dr_4.c
index e503ef518788cc42e892b425e74811c92ce5825a..db45a2587cd0967efad03a00caf1d124ed189134 100644 (file)
--- a/sail/dr_4.c
+++ b/sail/dr_4.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dr_4.c,v 1.15 2009/03/14 22:52:52 dholland Exp $       */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * 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
@@ -10,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.
  *
@@ -31,35 +29,42 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)dr_4.c     5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)dr_4.c     8.2 (Berkeley) 4/28/95";
+#else
+__RCSID("$NetBSD: dr_4.c,v 1.15 2009/03/14 22:52:52 dholland Exp $");
+#endif
 #endif /* not lint */
 
-#include "externs.h"
+#include <stdlib.h>
+#include "extern.h"
 
-ungrap(from, to)
-register struct ship *from, *to;
+void
+ungrap(struct ship *from, struct ship *to)
 {
-       register k;
+       int k;
        char friend;
 
        if ((k = grappled2(from, to)) == 0)
                return;
        friend = capship(from)->nationality == capship(to)->nationality;
        while (--k >= 0) {
-               if (friend || die() < 3) {
+               if (friend || dieroll() < 3) {
                        cleangrapple(from, to, 0);
-                       makesignal(from, "ungrappling %s (%c%c)", to);
+                       makesignal(from, "ungrappling $$", to);
                }
        }
 }
 
-grap(from, to)
-register struct ship *from, *to;
+void
+grap(struct ship *from, struct ship *to)
 {
-       if (capship(from)->nationality != capship(to)->nationality && die() > 2)
+       if (capship(from)->nationality != capship(to)->nationality &&
+           dieroll() > 2)
                return;
-       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);
+       send_grap(from, to->file->index);
+       send_grap(to, from->file->index);
+       makesignal(from, "grappled with $$", to);
 }