I was bored, so... simplify(?) this code a bit.

[bsdgames-darwin.git] / sail / pl_7.c

diff --git a/sail/pl_7.c b/sail/pl_7.c
index 36cd5347ac4ee092193719bce6eaa82e98f6b25b..82a4afbd19eb72ebb93e5c3c051d62699991da45 100644 (file)
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_7.c,v 1.17 2001/01/04 02:43:33 jwise Exp $  */
+/*     $NetBSD: pl_7.c,v 1.26 2001/12/06 12:21:00 blymn Exp $  */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,41 +38,23 @@
 #if 0
 static char sccsid[] = "@(#)pl_7.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_7.c,v 1.17 2001/01/04 02:43:33 jwise Exp $");
+__RCSID("$NetBSD: pl_7.c,v 1.26 2001/12/06 12:21:00 blymn Exp $");
 #endif
 #endif /* not lint */
 
-#include <sys/ttydefaults.h>
-#include "player.h"
-#ifdef __STDC__
+#include <curses.h>
+#include <signal.h>
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
+#include "extern.h"
+#include "player.h"
+#include "display.h"
 
-void   initscreen(void);
-void   cleanupscreen(void);
-void   newturn(int);
-void   Signal(const char *, struct ship *, ...);
-void   Msg(const char *, ...);
 static void    Scroll(void);
-void   prompt(const char *, struct ship *);
 static void    endprompt(int);
-int    sgetch(const char *, struct ship *, int);
-void   sgetstr(const char *, char *, int);
-void   draw_screen(void);
-void   draw_view(void);
-void   draw_turn(void);
-void   draw_stat(void);
-void   draw_slot(void);
-void   draw_board(void);
-void   centerview(void);
-void   upview(void);
-void   downview(void);
-void   leftview(void);
-void   rightview(void);
 static void    adjustview(void);
 
 /*
@@ -90,9 +72,9 @@ WINDOW *scroll_w;
 WINDOW *stat_w;
 WINDOW *turn_w;
 
-char done_curses;
-char loaded, fired, changed, repaired;
-char dont_adjust;
+int done_curses;
+int loaded, fired, changed, repaired;
+int dont_adjust;
 int viewrow, viewcol;
 char movebuf[sizeof SHIP(0)->file->movebuf];
 int player;
@@ -119,7 +101,7 @@ initscreen(void)
        leaveok(stat_w, 1);
        leaveok(turn_w, 1);
        noecho();
-       crmode();
+       cbreak();
 }
 
 void
@@ -196,9 +178,9 @@ Signal(const char *fmt, struct ship *ship, ...)
        va_list ap;
        char format[BUFSIZ];
 
-       va_start(ap, ship);
        if (!done_curses)
                return;
+       va_start(ap, ship);
        if (*fmt == '\7')
                putchar(*fmt++);
        fmtship(format, sizeof(format), fmt, ship);
@@ -213,9 +195,9 @@ Msg(const char *fmt, ...)
 {
        va_list ap;
 
-       va_start(ap, fmt);
        if (!done_curses)
                return;
+       va_start(ap, fmt);
        if (*fmt == '\7')
                putchar(*fmt++);
        vwprintw(scroll_w, fmt, ap);