de-__P().

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

diff --git a/atc/graphics.c b/atc/graphics.c
index 6e4ec80c99fda7832185f3908ab621391bb57a0f..d60a99b85ca5228619c98d2603fdc03e765a1bc1 100644 (file)
--- a/atc/graphics.c
+++ b/atc/graphics.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: graphics.c,v 1.4 1997/10/10 02:07:11 lukem Exp $       */
+/*     $NetBSD: graphics.c,v 1.9 1999/09/10 00:16:43 jsm Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,7 +50,7 @@
 #if 0
 static char sccsid[] = "@(#)graphics.c 8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: graphics.c,v 1.4 1997/10/10 02:07:11 lukem Exp $");
+__RCSID("$NetBSD: graphics.c,v 1.9 1999/09/10 00:16:43 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -69,15 +69,14 @@ WINDOW      *radar, *cleanradar, *credit, *input, *planes;
 int
 getAChar()
 {
-#ifdef BSD
-       return (getchar());
-#endif
-#ifdef SYSV
        int c;
 
-       while ((c = getchar()) == -1 && errno == EINTR) ;
+       errno = 0;
+       while ((c = getchar()) == EOF && errno == EINTR) {
+               errno = 0;
+               clearerr(stdin);
+       }
        return(c);
-#endif
 }
 
 void
@@ -130,10 +129,11 @@ init_gr()
 
 void
 setup_screen(scp)
-       C_SCREEN        *scp;
+       const C_SCREEN  *scp;
 {
        int     i, j;
-       char    str[3], *airstr;
+       char    str[3];
+       const char *airstr;
 
        str[2] = '\0';
 
@@ -224,7 +224,7 @@ void
 draw_line(w, x, y, lx, ly, s)
        WINDOW  *w;
        int      x, y, lx, ly;
-       char    *s;
+       const char      *s;
 {
        int     dx, dy;
 
@@ -262,7 +262,7 @@ iomove(pos)
 void
 ioaddstr(pos, str)
        int      pos;
-       char    *str;
+       const char      *str;
 {
        wmove(input, 0, pos);
        waddstr(input, str);
@@ -281,7 +281,7 @@ ioclrtobot()
 void
 ioerror(pos, len, str)
        int      pos, len;
-       char    *str;
+       const char      *str;
 {
        int     i;
 
@@ -296,7 +296,7 @@ ioerror(pos, len, str)
 
 void
 quit(dummy)
-       int dummy;
+       int dummy __attribute__((__unused__));
 {
        int                     c, y, x;
 #ifdef BSD
@@ -380,8 +380,8 @@ planewin()
 
 void
 loser(p, s)
-       PLANE   *p;
-       char    *s;
+       const PLANE     *p;
+       const char      *s;
 {
        int                     c;
 #ifdef BSD
@@ -400,8 +400,12 @@ loser(p, s)
 
        wmove(input, 0, 0);
        wclrtobot(input);
-       wprintw(input, "Plane '%c' %s\n\nHit space for top players list...",
-               name(p), s);
+       /* p may be NULL if we ran out of memory */
+       if (p == NULL)
+               wprintw(input, "%s\n\nHit space for top players list...", s);
+       else
+               wprintw(input, "Plane '%c' %s\n\nHit space for top players list...",
+                       name(p), s);
        wrefresh(input);
        fflush(stdout);
        while ((c = getchar()) != EOF && c != ' ')