Merge upstream (can't test, hopefully nothing broke)

[bsdgames-darwin.git] / atc / extern.h

diff --git a/atc/extern.h b/atc/extern.h
index 7931c3ec49fbb14e3c3584a1a813cd780260838c..3bbe120252681ce4972b358afd13b96d46ce2e77 100644 (file)
--- a/atc/extern.h
+++ b/atc/extern.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.8 1999/07/17 19:57:03 hubertf Exp $       */
+/*     $NetBSD: extern.h,v 1.19 2015/06/25 05:33:02 dholland Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -47,14 +43,20 @@
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 
+#include <time.h>  /* for time_t */
+
+
 extern char            GAMES[];
-extern const char      *file;
+extern const char      *filename;
 
-extern int             clck, safe_planes, start_time, test_mode;
+extern int             clck, safe_planes, test_mode;
+extern time_t          start_time;
 
+#if 0
 extern FILE            *filein, *fileout;
+#endif 
 
-extern C_SCREEN                screen, *sp;
+extern C_SCREEN                *sp;
 
 extern LIST            air, ground;
 
@@ -62,79 +64,44 @@ extern struct termios       tty_start, tty_new;
 
 extern DISPLACEMENT    displacement[MAXDIR];
 
-int            addplane __P((void));
-void           append __P((LIST *, PLANE *));
-void           check_adir __P((int, int, int));
-void           check_edge __P((int, int));
-void           check_edir __P((int, int, int));
-void           check_line __P((int, int, int, int));
-void           check_linepoint __P((int, int));
-void           check_point __P((int, int));
-int            checkdefs __P((void));
-int            compar __P((const void *, const void *));
-void           delete __P((LIST *, PLANE *));
-int            dir_deg __P((int));
-int            dir_no __P((char));
-void           done_screen __P((void));
-void           draw_all __P((void));
-void           draw_line __P((WINDOW *, int, int, int, int, const char *));
-void           erase_all __P((void));
-int            getAChar __P((void));
-int            getcommand __P((void));
-int            gettoken __P((void));
-void           init_gr __P((void));
-void           ioaddstr __P((int, const char *));
-void           ioclrtobot __P((void));
-void           ioclrtoeol __P((int));
-void           ioerror __P((int, int, const char *));
-void           iomove __P((int));
-int            list_games __P((void));
-int            log_score __P((int));
-void           log_score_quit __P((int)) __attribute__((__noreturn__));
-void           loser __P((const PLANE *, const char *)) __attribute__((__noreturn__));
-int            main __P((int, char *[]));
-char           name __P((const PLANE *));
-int            next_plane __P((void));
-void           noise __P((void));
-int            number __P((char));
-void           open_score_file __P((void));
-void           planewin __P((void));
-int            pop __P((void));
-void           push __P((int, int));
-void           quit __P((int));
-int            read_file __P((const char *));
-void           redraw __P((void));
-void           rezero __P((void));
-void           setup_screen __P((const C_SCREEN *));
-int            too_close __P((const PLANE *p1, const PLANE *p2, int));
-void           update __P((int));
-int            yyerror __P((const char *));
-int            yylex __P((void));
-int            yyparse __P((void));
-const char     *Left __P((char));
-const char     *Right __P((char));
-const char     *airport __P((char));
-const char     *beacon __P((char));
-const char     *benum __P((char));
-const char     *circle __P((char));
-const char     *climb __P((char));
-const char     *command __P((const PLANE *));
-const char     *default_game __P((void));
-const char     *delayb __P((char));
-const char     *descend __P((char));
-const char     *ex_it __P((char));
-PLANE         *findplane __P((int));
-const char     *ignore __P((char));
-const char     *left __P((char));
-const char     *mark __P((char));
-PLANE         *newplane __P((void));
-const char     *okay_game __P((const char *));
-const char     *rel_dir __P((char));
-const char     *right __P((char));
-const char     *setalt __P((char));
-const char     *setplane __P((char));
-const char     *setrelalt __P((char));
-const char     *timestr __P((int));
-const char     *to_dir __P((char));
-const char     *turn __P((char));
-const char     *unmark __P((char));
+/* in graphics.c */
+void shutdown_gr(void);
+void ioaskquit(void);
+void ionoquit(void);
+void losermsg(const PLANE *p, const char *msg);
+
+/* misc */
+void           addplane(void);
+void           append(LIST *, PLANE *);
+void           check_adir(int, int, int);
+void           delete(LIST *, PLANE *);
+int            dir_no(int);
+void           done_screen(void);
+void           draw_all(void);
+void           erase_all(void);
+int            getAChar(void);
+int            getcommand(void);
+void           init_gr(void);
+void           ioaddstr(int, const char *);
+void           ioclrtobot(void);
+void           ioclrtoeol(int);
+void           ioerror(int, int, const char *);
+void           iomove(int);
+int            log_score(int);
+void           log_score_quit(int) __dead;
+void           loser(const PLANE *, const char *) __dead;
+int            main(int, char *[]);
+char           name(const PLANE *);
+int            number(int);
+void           open_score_file(void);
+void           planewin(void);
+void           redraw(void);
+void           setup_screen(const C_SCREEN *);
+void           update(int);
+int            yylex(void);
+#ifndef YYEMPTY
+int            yyparse(void);
+#endif
+const char     *command(const PLANE *);
+PLANE         *findplane(int);
+PLANE         *newplane(void);