Generate <>& symbolically. I'm avoiding .../dist/... directories for now.

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

diff --git a/sail/misc.c b/sail/misc.c
index 7b0c465e16275ad5d1222037a8c1a643937ba55f..91a9e6edc71f2af9c390fddf7bae5363a0e2c3b7 100644 (file)
--- a/sail/misc.c
+++ b/sail/misc.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: misc.c,v 1.12 2001/02/05 01:10:10 christos 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
@@ -31,23 +33,33 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c     5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: misc.c,v 1.2 1993/08/01 18:51:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)misc.c     8.2 (Berkeley) 4/28/95";
+#else
+__RCSID("$NetBSD: misc.c,v 1.12 2001/02/05 01:10:10 christos Exp $");
+#endif
 #endif /* not lint */
 
-#include "externs.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include "extern.h"
 #include "pathnames.h"
 
 #define distance(x,y) (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)
 
+static int     angle(int, int);
+
 /* XXX */
-range(from, to)
-struct ship *from, *to;
+int
+range(struct ship *from, struct ship *to)
 {
-       register bow1r, bow1c, bow2r, bow2c;
+       int bow1r, bow1c, bow2r, bow2c;
        int stern1r, stern1c, stern2c, stern2r;
-       register int bb, bs, sb, ss, result;
+       int bb, bs, sb, ss, result;
 
        if (!to->file->dir)
                return -1;
@@ -70,12 +82,10 @@ struct ship *from, *to;
 }
 
 struct ship *
-closestenemy(from, side, anyship)
-register struct ship *from;
-char side, anyship;
+closestenemy(struct ship *from, int side, int anyship)
 {
-       register struct ship *sp;
-       register char a;
+       struct ship *sp;
+       char a;
        int olddist = 30000, dist;
        struct ship *closest = 0;
 
@@ -98,10 +108,10 @@ char side, anyship;
        return closest;
 }
 
-angle(dr, dc)
-register dr, dc;
+static int
+angle(int dr, int dc)
 {
-       register i;
+       int i;
 
        if (dc >= 0 && dr > 0)
                i = 0;
@@ -125,11 +135,12 @@ register dr, dc;
        return i % 8 + 1;
 }
 
-gunsbear(from, to)             /* checks for target bow or stern */
-register struct ship *from, *to;
+/* checks for target bow or stern */
+int
+gunsbear(struct ship *from, struct ship *to)
 {
        int Dr, Dc, i;
-       register ang;
+       int ang;
 
        Dr = from->file->row - to->file->row;
        Dc = to->file->col - from->file->col;
@@ -146,12 +157,12 @@ register struct ship *from, *to;
        return 0;
 }
 
-portside(from, on, quick)
-register struct ship *from, *on;
-int quick;                     /* returns true if fromship is */
-{                              /* shooting at onship's starboard side */
-       register ang;
-       register Dr, Dc;
+/* returns true if fromship is shooting at onship's starboard side */
+int
+portside(struct ship *from, struct ship *on, int quick)
+{
+       int ang;
+       int Dr, Dc;
 
        Dr = from->file->row - on->file->row;
        Dc = on->file->col - from->file->col;
@@ -166,10 +177,10 @@ int quick;                        /* returns true if fromship is */
        return ang < 5;
 }
 
-colours(sp)
-register struct ship *sp;
+int
+colours(struct ship *sp)
 {
-       register char flag;
+       char flag = '\0';
 
        if (sp->file->struck)
                flag = '!';
@@ -183,19 +194,22 @@ register struct ship *sp;
        return sp->file->FS ? flag : tolower(flag);
 }
 
-#include <sys/file.h>
-log(s)
-register struct ship *s;
+void
+logger(struct ship *s)
 {
        FILE *fp;
        int persons;
        int n;
        struct logs log[NLOG];
        float net;
-       register struct logs *lp;
+       struct logs *lp;
 
-       if ((fp = fopen(_PATH_LOGFILE, "r+")) == NULL)
+       setegid(egid);
+       if ((fp = fopen(_PATH_LOGFILE, "r+")) == NULL) {
+               setegid(gid);
                return;
+       }
+       setegid(gid);
 #ifdef LOCK_EX
        if (flock(fileno(fp), LOCK_EX) < 0)
                return;
@@ -208,27 +222,24 @@ register struct ship *s;
                        = lp->l_gamenum = lp->l_netpoints = 0;
        rewind(fp);
        if (persons < 0)
-               (void) putw(1, fp);
+               putw(1, fp);
        else
-               (void) putw(persons + 1, fp);
+               putw(persons + 1, fp);
        for (lp = log; lp < &log[NLOG]; lp++)
                if (net > (float)lp->l_netpoints
                    / scene[lp->l_gamenum].ship[lp->l_shipnum].specs->pts) {
-                       (void) fwrite((char *)log,
-                               sizeof (struct logs), lp - log, fp);
-                       (void) strcpy(log[NLOG-1].l_name, s->file->captain);
+                       fwrite((char *)log, sizeof (struct logs), lp - log, fp);
+                       strcpy(log[NLOG-1].l_name, s->file->captain);
                        log[NLOG-1].l_uid = getuid();
                        log[NLOG-1].l_shipnum = s->file->index;
                        log[NLOG-1].l_gamenum = game;
                        log[NLOG-1].l_netpoints = s->file->points;
-                       (void) fwrite((char *)&log[NLOG-1],
-                               sizeof (struct logs), 1, fp);
-                       (void) fwrite((char *)lp,
-                               sizeof (struct logs), &log[NLOG-1] - lp, fp);
+                       fwrite((char *)&log[NLOG-1], sizeof (struct logs), 1, fp);
+                       fwrite((char *)lp, sizeof (struct logs), &log[NLOG-1] - lp, fp);
                        break;
                }
 #ifdef LOCK_EX
-       (void) flock(fileno(fp), LOCK_UN);
+       flock(fileno(fp), LOCK_UN);
 #endif
-       (void) fclose(fp);
+       fclose(fp);
 }