revert previous and don't parse octal

[bsdgames-darwin.git] / sail / player.h

diff --git a/sail/player.h b/sail/player.h
index e63fc8290baa2c0031898edc8f058b8eab11ebab..cb555a05b16e5555765a7988a66f73548aa1710c 100644 (file)
--- a/sail/player.h
+++ b/sail/player.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: player.h,v 1.13 2009/08/12 09:05:08 dholland Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,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.
  *
@@ -30,13 +28,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     from: @(#)player.h      5.4 (Berkeley) 6/1/90
- *     $Id: player.h,v 1.3 1993/08/01 18:51:54 mycroft Exp $
+ *     @(#)player.h    8.2 (Berkeley) 5/3/95
  */
 
-#include <curses.h>
-#include "externs.h"
-
 /* sizes and coordinates for the screen */
 
 #define LINE_T         0
@@ -91,28 +85,15 @@
 #define SLOT_B         VIEW_B
 #define SLOT_R         (SLOT_L+SLOT_X-1)
 
-#ifdef SIGTSTP
-#define SCREENTEST()   (initscr() != ERR && signal(SIGTSTP, SIG_DFL) != SIG_ERR && STAT_R < COLS && SCROLL_Y > 0)
-#else
-#define SCREENTEST()   (initscr() != ERR && STAT_R < COLS && SCROLL_Y > 0)
-#endif
-
-WINDOW *view_w;
-WINDOW *slot_w;
-WINDOW *scroll_w;
-WINDOW *stat_w;
-WINDOW *turn_w;
-
-char done_curses;
-char loaded, fired, changed, repaired;
-char dont_adjust;
-int viewrow, viewcol;
-char movebuf[sizeof SHIP(0)->file->movebuf];
-char version[];
-int player;
-struct ship *ms;               /* memorial structure, &cc->ship[player] */
-struct File *mf;               /* ms->file */
-struct shipspecs *mc;          /* ms->specs */
+extern int done_curses;
+extern int loaded, fired, changed, repaired;
+extern int dont_adjust;
+extern char movebuf[sizeof SHIP(0)->file->movebuf];
+extern const char version[];
+extern int player;
+extern struct ship *ms;                /* memorial structure, &cc->ship[player] */
+extern struct File *mf;                /* ms->file */
+extern struct shipspecs *mc;   /* ms->specs */
 
 /* condition codes for leave() */
 #define LEAVE_QUIT     0