cgram: conform to lint's strict bool mode, KNF

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

diff --git a/atc/graphics.c b/atc/graphics.c
index 3e082ad2369d729d5cf36ba830a04c3d13f3de43..a6887c716f823a628027730ad87d510fffca1945 100644 (file)
--- a/atc/graphics.c
+++ b/atc/graphics.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: graphics.c,v 1.13 2006/06/07 09:22:52 jnemeth Exp $    */
+/*     $NetBSD: graphics.c,v 1.20 2015/06/25 05:33:02 dholland Exp $   */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,11 +46,20 @@
 #if 0
 static char sccsid[] = "@(#)graphics.c 8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: graphics.c,v 1.13 2006/06/07 09:22:52 jnemeth Exp $");
+__RCSID("$NetBSD: graphics.c,v 1.20 2015/06/25 05:33:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
-#include "include.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <curses.h>
+#include <errno.h>
+#include <err.h>
+
+#include "def.h"
+#include "struct.h"
+#include "extern.h"
+#include "tunable.h"
 
 #define C_TOPBOTTOM            '-'
 #define C_LEFTRIGHT            '|'
@@ -60,7 +69,9 @@ __RCSID("$NetBSD: graphics.c,v 1.13 2006/06/07 09:22:52 jnemeth Exp $");
 #define C_BEACON               '*'
 #define C_CREDIT               '*'
 
-WINDOW *radar, *cleanradar, *credit, *input, *planes;
+static void draw_line(WINDOW *, int, int, int, int, const char *);
+
+static WINDOW *radar, *cleanradar, *credit, *input, *planes;
 
 int
 getAChar(void)
@@ -115,7 +126,8 @@ init_gr(void)
 {
        static char     buffer[BUFSIZ];
 
-       (void)initscr();
+       if (!initscr())
+               errx(0, "couldn't initialize screen");
        setbuf(stdout, buffer);
        input = newwin(INPUT_LINES, COLS - PLANE_COLS, LINES - INPUT_LINES, 0);
        credit = newwin(INPUT_LINES, PLANE_COLS, LINES - INPUT_LINES, 
@@ -123,10 +135,20 @@ init_gr(void)
        planes = newwin(LINES - INPUT_LINES, PLANE_COLS, 0, COLS - PLANE_COLS);
 }
 
+void
+shutdown_gr(void)
+{
+       (void)clear();  /* move to top of screen */
+       (void)refresh();
+       (void)fflush(stdout);
+       (void)endwin();
+}
+
 void
 setup_screen(const C_SCREEN *scp)
 {
        int     i, j;
+       unsigned iu;
        char    str[3];
        const char *airstr;
 
@@ -162,10 +184,10 @@ setup_screen(const C_SCREEN *scp)
         * through beacons and exit points.
         */
        str[0] = C_LINE;
-       for (i = 0; i < scp->num_lines; i++) {
+       for (iu = 0; iu < scp->num_lines; iu++) {
                str[1] = ' ';
-               draw_line(radar, scp->line[i].p1.x, scp->line[i].p1.y,
-                       scp->line[i].p2.x, scp->line[i].p2.y, str);
+               draw_line(radar, scp->line[iu].p1.x, scp->line[iu].p1.y,
+                       scp->line[iu].p2.x, scp->line[iu].p2.y, str);
        }
 
        str[0] = C_TOPBOTTOM;
@@ -190,22 +212,22 @@ setup_screen(const C_SCREEN *scp)
        }
 
        str[0] = C_BEACON;
-       for (i = 0; i < scp->num_beacons; i++) {
-               str[1] = '0' + i;
-               (void)wmove(radar, scp->beacon[i].y, scp->beacon[i].x * 2);
+       for (iu = 0; iu < scp->num_beacons; iu++) {
+               str[1] = '0' + iu;
+               (void)wmove(radar, scp->beacon[iu].y, scp->beacon[iu].x * 2);
                (void)waddstr(radar, str);
        }
 
-       for (i = 0; i < scp->num_exits; i++) {
-               (void)wmove(radar, scp->exit[i].y, scp->exit[i].x * 2);
-               (void)waddch(radar, '0' + i);
+       for (iu = 0; iu < scp->num_exits; iu++) {
+               (void)wmove(radar, scp->exit[iu].y, scp->exit[iu].x * 2);
+               (void)waddch(radar, '0' + iu);
        }
 
        airstr = "^?>?v?<?";
-       for (i = 0; i < scp->num_airports; i++) {
-               str[0] = airstr[scp->airport[i].dir];
-               str[1] = '0' + i;
-               (void)wmove(radar, scp->airport[i].y, scp->airport[i].x * 2);
+       for (iu = 0; iu < scp->num_airports; iu++) {
+               str[0] = airstr[scp->airport[iu].dir];
+               str[1] = '0' + iu;
+               (void)wmove(radar, scp->airport[iu].y, scp->airport[iu].x * 2);
                (void)waddstr(radar, str);
        }
        
@@ -215,7 +237,7 @@ setup_screen(const C_SCREEN *scp)
        (void)fflush(stdout);
 }
 
-void
+static void
 draw_line(WINDOW *w, int x, int y, int lx, int ly, const char *s)
 {
        int     dx, dy;
@@ -280,43 +302,25 @@ ioerror(int pos, int len, const char *str)
        (void)fflush(stdout);
 }
 
-/* ARGSUSED */
+static int ioquit_x, ioquit_y;
+
 void
-quit(int dummy __attribute__((__unused__)))
+ioaskquit(void)
 {
-       int                     c, y, x;
-#ifdef BSD
-       struct itimerval        itv;
-#endif
-
-       getyx(input, y, x);
+       getyx(input, ioquit_y, ioquit_x);
        (void)wmove(input, 2, 0);
        (void)waddstr(input, "Really quit? (y/n) ");
        (void)wclrtobot(input);
        (void)wrefresh(input);
        (void)fflush(stdout);
+}
 
-       c = getchar();
-       if (c == EOF || c == 'y') {
-               /* disable timer */
-#ifdef BSD
-               itv.it_value.tv_sec = 0;
-               itv.it_value.tv_usec = 0;
-               (void)setitimer(ITIMER_REAL, &itv, NULL);
-#endif
-#ifdef SYSV
-               alarm(0);
-#endif
-               (void)fflush(stdout);
-               (void)clear();
-               (void)refresh();
-               (void)endwin();
-               (void)log_score(0);
-               exit(0);
-       }
+void
+ionoquit(void)
+{
        (void)wmove(input, 2, 0);
        (void)wclrtobot(input);
-       (void)wmove(input, y, x);
+       (void)wmove(input, ioquit_y, ioquit_x);
        (void)wrefresh(input);
        (void)fflush(stdout);
 }
@@ -365,42 +369,20 @@ planewin(void)
 }
 
 void
-loser(const PLANE *p, const char *s)
+losermsg(const PLANE *p, const char *msg)
 {
-       int                     c;
-#ifdef BSD
-       struct itimerval        itv;
-#endif
-
-       /* disable timer */
-#ifdef BSD
-       itv.it_value.tv_sec = 0;
-       itv.it_value.tv_usec = 0;
-       (void)setitimer(ITIMER_REAL, &itv, NULL);
-#endif
-#ifdef SYSV
-       alarm(0);
-#endif
-
        (void)wmove(input, 0, 0);
        (void)wclrtobot(input);
        /* p may be NULL if we ran out of memory */
        if (p == NULL)
                (void)wprintw(input, "%s\n\nHit space for top players list...",
-                   s);
+                   msg);
        else {
-               (void)wprintw(input, "Plane '%c' %s\n\n", name(p), s);
+               (void)wprintw(input, "Plane '%c' %s\n\n", name(p), msg);
                (void)wprintw(input, "Hit space for top players list...");
        }
        (void)wrefresh(input);
        (void)fflush(stdout);
-       while ((c = getchar()) != EOF && c != ' ')
-               ;
-       (void)clear();  /* move to top of screen */
-       (void)refresh();
-       (void)endwin();
-       (void)log_score(0);
-       exit(0);
 }
 
 void