Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the list of place types an enumeration. Use unsigned values for 

place numbers.
This commit is contained in:
dholland 2014-03-22 22:58:56 +00:00
parent 3216ca61cd
commit 1e7c0bc4d8
6 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
games/atc/def.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: def.h,v 1.6 2003/08/07 09:36:53 agc Exp $ */
/* $NetBSD: def.h,v 1.7 2014/03/22 22:58:56 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -65,11 +65,6 @@
#define D_UP 3
#define D_DOWN 4
#define T_NODEST 0
#define T_BEACON 1
#define T_EXIT 2
#define T_AIRPORT 3
#undef S_NONE
#undef S_GONE
#undef S_MARKED

4
games/atc/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.16 2009/08/12 04:48:03 dholland Exp $ */
/* $NetBSD: extern.h,v 1.17 2014/03/22 22:58:56 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -61,7 +61,7 @@ extern struct termios tty_start, tty_new;
extern DISPLACEMENT displacement[MAXDIR];
int addplane(void);
void addplane(void);
void append(LIST *, PLANE *);
void check_adir(int, int, int);
void delete(LIST *, PLANE *);

7
games/atc/input.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: input.c,v 1.27 2014/03/22 22:47:07 dholland Exp $ */
/* $NetBSD: input.c,v 1.28 2014/03/22 22:58:56 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -46,7 +46,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: input.c,v 1.27 2014/03/22 22:47:07 dholland Exp $");
__RCSID("$NetBSD: input.c,v 1.28 2014/03/22 22:58:56 dholland Exp $");
#endif
#endif /* not lint */
@ -199,7 +199,8 @@ static PLANE p;
static STACK stack[MAXDEPTH];
static int level;
static int tval;
static int dest_type, dir;
static int dir;
static enum places dest_type;
static unsigned dest_no;
static int

6
games/atc/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.21 2012/10/12 10:44:20 dholland Exp $ */
/* $NetBSD: main.c,v 1.22 2014/03/22 22:58:56 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -51,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: main.c,v 1.21 2012/10/12 10:44:20 dholland Exp $");
__RCSID("$NetBSD: main.c,v 1.22 2014/03/22 22:58:56 dholland Exp $");
#endif
#endif /* not lint */
@ -144,7 +144,7 @@ main(int argc, char *argv[])
init_gr();
setup_screen(sp);
(void)addplane();
addplane();
(void)signal(SIGINT, quit);
(void)signal(SIGQUIT, quit);

17
games/atc/struct.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: struct.h,v 1.9 2014/03/22 22:45:05 dholland Exp $ */
/* $NetBSD: struct.h,v 1.10 2014/03/22 22:58:56 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -72,15 +72,22 @@ typedef struct {
AIRPORT *airport;
} C_SCREEN;
enum places {
T_NODEST = 0,
T_BEACON = 1,
T_EXIT = 2,
T_AIRPORT = 3
};
typedef struct plane {
struct plane *next, *prev;
int status;
int plane_no;
int plane_type;
int orig_no;
int orig_type;
int dest_no;
int dest_type;
unsigned orig_no;
enum places orig_type;
unsigned dest_no;
enum places dest_type;
int altitude;
int new_altitude;
int dir;

18
games/atc/update.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: update.c,v 1.24 2014/03/22 22:45:05 dholland Exp $ */
/* $NetBSD: update.c,v 1.25 2014/03/22 22:58:56 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -46,7 +46,7 @@
#if 0
static char sccsid[] = "@(#)update.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: update.c,v 1.24 2014/03/22 22:45:05 dholland Exp $");
__RCSID("$NetBSD: update.c,v 1.25 2014/03/22 22:58:56 dholland Exp $");
#endif
#endif /* not lint */
@ -217,7 +217,7 @@ update(int dummy __unused)
* we don't update props on odd updates.
*/
if ((rand() % sp->newplane_time) == 0)
(void)addplane();
addplane();
#ifdef SYSV
alarm(sp->update_secs);
@ -233,14 +233,14 @@ command(const PLANE *pp)
buf[0] = '\0';
bp = buf;
bpsize = sizeof(buf);
(void)snprintf(bp, bpsize, "%c%d%c%c%d: ", name(pp), pp->altitude,
(void)snprintf(bp, bpsize, "%c%d%c%c%u: ", name(pp), pp->altitude,
(pp->fuel < LOWFUEL) ? '*' : ' ',
(pp->dest_type == T_AIRPORT) ? 'A' : 'E', pp->dest_no);
comm_start = bp = strchr(buf, '\0');
bpsize = buf + sizeof(buf) - bp;
if (pp->altitude == 0)
(void)snprintf(bp, bpsize, "Holding @ A%d", pp->orig_no);
(void)snprintf(bp, bpsize, "Holding @ A%u", pp->orig_no);
else if (pp->new_dir >= MAXDIR || pp->new_dir < 0)
(void)snprintf(bp, bpsize, "Circle");
else if (pp->new_dir != pp->dir)
@ -308,7 +308,7 @@ next_plane(void)
return (last_plane);
}
int
void
addplane(void)
{
PLANE p, *pp, *p1;
@ -363,10 +363,10 @@ addplane(void)
break;
}
if (i >= num_starts)
return (-1);
return;
pnum = next_plane();
if (pnum < 0)
return (-1);
return;
p.plane_no = pnum;
pp = newplane();
@ -378,8 +378,6 @@ addplane(void)
append(&ground, pp);
else
append(&air, pp);
return (pp->dest_type);
}
PLANE *