Simplify syncing with upstream

[bsdgames-darwin.git] / atc / input.c

diff --git a/atc/input.c b/atc/input.c
index 5be372c94dd698f9d80ed75ed59a8618ffc4444f..3b44be094b269a6206a1b43b045c358bcacabee7 100644 (file)
--- a/atc/input.c
+++ b/atc/input.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: input.c,v 1.25 2014/03/22 22:24:21 dholland Exp $      */
+/*     $NetBSD: input.c,v 1.29 2015/06/19 06:02:31 dholland Exp $      */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,12 +46,26 @@
 #if 0
 static char sccsid[] = "@(#)input.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.25 2014/03/22 22:24:21 dholland Exp $");
+__RCSID("$NetBSD: input.c,v 1.29 2015/06/19 06:02:31 dholland Exp $");
 #endif
 #endif /* not lint */
 
-#include "include.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <termios.h>
+#include <ctype.h>
+#include <assert.h>
+#include <math.h>
+
 #include "pathnames.h"
+#include "def.h"
+#include "struct.h"
+#include "extern.h"
+#include "tunable.h"
 
 static void rezero(void);
 static void noise(void);
@@ -199,7 +213,9 @@ static PLANE p;
 static STACK stack[MAXDEPTH];
 static int level;
 static int tval;
-static int dest_type, dest_no, dir;
+static int dir;
+static enum places dest_type;
+static unsigned dest_no;
 
 static int
 pop(void)
@@ -393,7 +409,7 @@ setplane(int c)
        if (pp == NULL)
                return ("Unknown Plane");
        (void)memcpy(&p, pp, sizeof (p));
-       p.delayd = 0;
+       p.delayd = false;
        return (NULL);
 }
 
@@ -474,7 +490,7 @@ delayb(int ch)
        ydiff = SGN(ydiff);
        if (xdiff != displacement[p.dir].dx || ydiff != displacement[p.dir].dy)
                return ("Beacon is not in flight path");
-       p.delayd = 1;
+       p.delayd = true;
        p.delayd_no = bn;
 
        if (dest_type != T_NODEST) {