diff options
Diffstat (limited to 'atc/update.c')
| -rw-r--r-- | atc/update.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/atc/update.c b/atc/update.c index 3a145e5f..3b8aa728 100644 --- a/atc/update.c +++ b/atc/update.c @@ -1,4 +1,4 @@ -/* $NetBSD: update.c,v 1.12 2003/08/07 09:36:55 agc Exp $ */ +/* $NetBSD: update.c,v 1.13 2005/07/01 00:48:34 jmc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,15 +46,14 @@ #if 0 static char sccsid[] = "@(#)update.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: update.c,v 1.12 2003/08/07 09:36:55 agc Exp $"); +__RCSID("$NetBSD: update.c,v 1.13 2005/07/01 00:48:34 jmc Exp $"); #endif #endif /* not lint */ #include "include.h" void -update(dummy) - int dummy __attribute__((__unused__)); +update(int dummy __attribute__((__unused__))) { int i, dir_diff, unclean; PLANE *pp, *p1, *p2; @@ -219,8 +218,7 @@ update(dummy) } const char * -command(pp) - const PLANE *pp; +command(const PLANE *pp) { static char buf[50], *bp, *comm_start; @@ -250,8 +248,7 @@ command(pp) } char -name(p) - const PLANE *p; +name(const PLANE *p) { if (p->plane_type == 0) return ('A' + p->plane_no); @@ -260,8 +257,7 @@ name(p) } int -number(l) - char l; +number(int l) { if (l < 'a' && l > 'z' && l < 'A' && l > 'Z') return (-1); @@ -272,7 +268,7 @@ number(l) } int -next_plane() +next_plane(void) { static int last_plane = -1; PLANE *pp; @@ -301,10 +297,10 @@ next_plane() } int -addplane() +addplane(void) { PLANE p, *pp, *p1; - int i, num_starts, close, rnd, rnd2, pnum; + int i, num_starts, isclose, rnd, rnd2, pnum; memset(&p, 0, sizeof (p)); @@ -334,13 +330,13 @@ addplane() p.ypos = sp->exit[rnd2].y; p.new_dir = p.dir = sp->exit[rnd2].dir; p.altitude = p.new_altitude = 7; - close = 0; + isclose = 0; for (p1 = air.head; p1 != NULL; p1 = p1->next) if (too_close(p1, &p, 4)) { - close++; + isclose++; break; } - if (close) + if (isclose) continue; } else { p.orig_type = T_AIRPORT; @@ -373,9 +369,8 @@ addplane() return (pp->dest_type); } -PLANE * -findplane(n) - int n; +PLANE * +findplane(int n) { PLANE *pp; @@ -389,20 +384,18 @@ findplane(n) } int -too_close(p1, p2, dist) - const PLANE *p1, *p2; - int dist; +too_close(const PLANE *p1, const PLANE *p2, int dist) { if (ABS(p1->altitude - p2->altitude) <= dist && - ABS(p1->xpos - p2->xpos) <= dist && ABS(p1->ypos - p2->ypos) <= dist) + ABS(p1->xpos - p2->xpos) <= dist && + ABS(p1->ypos - p2->ypos) <= dist) return (1); else return (0); } int -dir_deg(d) - int d; +dir_deg(int d) { switch (d) { case 0: return (0); |