-/* $NetBSD: misc.c,v 1.4 1997/01/07 12:42:23 tls Exp $ */
+/* $NetBSD: misc.c,v 1.18 2009/03/14 19:35:13 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
* 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.
*
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$NetBSD: misc.c,v 1.4 1997/01/07 12:42:23 tls Exp $";
+__RCSID("$NetBSD: misc.c,v 1.18 2009/03/14 19:35:13 dholland Exp $");
#endif
#endif /* not lint */
+#include <ctype.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.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)
+#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;
}
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;
return closest;
}
-angle(dr, dc)
-register dr, dc;
+static int
+angle(int Dr, int Dc)
{
- register i;
+ int i;
- if (dc >= 0 && dr > 0)
+ if (Dc >= 0 && Dr > 0)
i = 0;
- else if (dr <= 0 && dc > 0)
+ else if (Dr <= 0 && Dc > 0)
i = 2;
- else if (dc <= 0 && dr < 0)
+ else if (Dc <= 0 && Dr < 0)
i = 4;
else
i = 6;
- dr = abs(dr);
- dc = abs(dc);
- if ((i == 0 || i == 4) && dc * 2.4 > dr) {
+ Dr = abs(Dr);
+ Dc = abs(Dc);
+ if ((i == 0 || i == 4) && Dc * 2.4 > Dr) {
i++;
- if (dc > dr * 2.4)
+ if (Dc > Dr * 2.4)
i++;
- } else if ((i == 2 || i == 6) && dr * 2.4 > dc) {
+ } else if ((i == 2 || i == 6) && Dr * 2.4 > Dc) {
i++;
- if (dr > dc * 2.4)
+ if (Dr > Dc * 2.4)
i++;
}
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;
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;
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 = '!';
if (sp->file->struck)
return flag;
flag = *countryname[capship(sp)->nationality];
- return sp->file->FS ? flag : tolower(flag);
+ return sp->file->FS ? flag : tolower((unsigned char)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;
#endif
net = (float)s->file->points / s->specs->pts;
persons = getw(fp);
- n = fread((char *)log, sizeof(struct logs), NLOG, fp);
+ n = fread(log, sizeof(struct logs), NLOG, fp);
for (lp = &log[n]; lp < &log[NLOG]; lp++)
lp->l_name[0] = lp->l_uid = lp->l_shipnum
= 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(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(&log[NLOG-1], sizeof (struct logs), 1, fp);
+ fwrite(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);
}
git.ckatri.com / bsdgames-darwin.git / blobdiff