lint

[unix-history] / usr / src / games / sail / player.h

diff --git a/usr/src/games/sail/player.h b/usr/src/games/sail/player.h
index 4b6aea6..8232942 100644 (file)
--- a/usr/src/games/sail/player.h
+++ b/usr/src/games/sail/player.h
@@ -1,6 +1,13 @@
 /*
 /*

- * sccsid = "@(#)player.h      2.1 %G%";
+ * Copyright (c) 1983 Regents of the University of California,
+ * All rights reserved.  Redistribution permitted subject to
+ * the terms of the Berkeley Software License Agreement.

  */
  */

+
+/*
+ * @(#)player.h        2.8 %G%
+ */
+

 #include <curses.h>
 #include "externs.h"
 
 #include <curses.h>
 #include "externs.h"
 


@@ -21,18 +28,18 @@
 #define BOX_R          (BOX_L+BOX_X-1)
 
 #define TURN_T         BOX_B
 #define BOX_R          (BOX_L+BOX_X-1)
 
 #define TURN_T         BOX_B

-#define TURN_X         7
-#define TURN_L         ((BOX_L+BOX_R-TURN_X)/2)

 #define TURN_Y         1
 #define TURN_Y         1

+#define TURN_L         ((BOX_L+BOX_R-TURN_X)/2)
+#define TURN_X         9

 #define TURN_B         (TURN_T+TURN_Y+1)
 #define TURN_R         (TURN_L+TURN_X+1)
 
 #define STAT_T         0
 #define TURN_B         (TURN_T+TURN_Y+1)
 #define TURN_R         (TURN_L+TURN_X+1)
 
 #define STAT_T         0

-#define STAT_L         (BOX_R+2)

 #define STAT_B         BOX_B
 #define STAT_B         BOX_B

-#define STAT_R         (COLS-1)
-#define STAT_X         (STAT_R-STAT_L+1)
+#define STAT_L         (BOX_R+2)
+#define STAT_X         14

 #define STAT_Y         (STAT_B-STAT_T+1)
 #define STAT_Y         (STAT_B-STAT_T+1)

+#define STAT_R         (STAT_L+STAT_X-1)

 #define STAT_1         0
 #define STAT_2          (STAT_1+4)
 #define STAT_3          (STAT_2+7)
 #define STAT_1         0
 #define STAT_2          (STAT_1+4)
 #define STAT_3          (STAT_2+7)


@@ -41,8 +48,8 @@
 #define SCROLL_L       0
 #define SCROLL_B       (LINES-1)
 #define SCROLL_R       (COLS-1)
 #define SCROLL_L       0
 #define SCROLL_B       (LINES-1)
 #define SCROLL_R       (COLS-1)

-#define SCROLL_X       COLS
-#define SCROLL_Y       (LINES-SCROLL_T)
+#define SCROLL_X       (SCROLL_R-SCROLL_L+1)
+#define SCROLL_Y       (SCROLL_B-SCROLL_T+1)

 
 #define VIEW_T         (BOX_T+1)
 #define VIEW_L         (BOX_L+1)
 
 #define VIEW_T         (BOX_T+1)
 #define VIEW_L         (BOX_L+1)


@@ -58,6 +65,12 @@
 #define SLOT_B         VIEW_B
 #define SLOT_R         (SLOT_L+SLOT_X-1)
 
 #define SLOT_B         VIEW_B
 #define SLOT_R         (SLOT_L+SLOT_X-1)
 

+#ifdef SIGTSTP
+#define SCREENTEST()   (initscr() != ERR && signal(SIGTSTP, SIG_DFL) != BADSIG && 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 *view_w;
 WINDOW *slot_w;
 WINDOW *scroll_w;


@@ -68,7 +81,7 @@ char done_curses;
 char loaded, fired, changed, repaired;
 char dont_adjust;
 int viewrow, viewcol;
 char loaded, fired, changed, repaired;
 char dont_adjust;
 int viewrow, viewcol;

-char movebuf[10];
+char movebuf[sizeof SHIP(0)->file->movebuf];

 char version[];
 int player;
 struct ship *ms;               /* memorial structure, &cc->ship[player] */
 char version[];
 int player;
 struct ship *ms;               /* memorial structure, &cc->ship[player] */


@@ -80,3 +93,5 @@ struct shipspecs *mc;         /* ms->specs */
 #define LEAVE_CAPTURED 1
 #define LEAVE_HURRICAN 2
 #define LEAVE_DRIVER   3
 #define LEAVE_CAPTURED 1
 #define LEAVE_HURRICAN 2
 #define LEAVE_DRIVER   3

+#define LEAVE_FORK     4
+#define LEAVE_SYNC     5