Don't initialise curses until after the initial non-curses setup (the

choice of scenario uses puts() rather than curses functions).

diff --git a/sail/pl_7.c b/sail/pl_7.c
index ad665bd25036a4122446f4ba7335a9033e219c98..db229d1cab7002eeb327265181850ecbec128af6 100644 (file)
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_7.c,v 1.13 1999/12/28 18:05:25 jsm Exp $    */
+/*     $NetBSD: pl_7.c,v 1.14 2000/01/31 11:08:53 jsm Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_7.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_7.c,v 1.13 1999/12/28 18:05:25 jsm Exp $");
+__RCSID("$NetBSD: pl_7.c,v 1.14 2000/01/31 11:08:53 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -80,6 +80,10 @@ struct shipspecs *mc;                /* ms->specs */
 void
 initscreen()
 {
+       if (!SCREENTEST()) {
+               printf("Can't sail on this terminal.\n");
+               exit(1);
+       }
        /* initscr() already done in SCREENTEST() */
        view_w = newwin(VIEW_Y, VIEW_X, VIEW_T, VIEW_L);
        slot_w = newwin(SLOT_Y, SLOT_X, SLOT_T, SLOT_L);

diff --git a/sail/pl_main.c b/sail/pl_main.c
index 64307e8b501e0aae2efe60562991a6f0fa4d4429..7beb658df55e515e87c42a4cc64959c2402d75b4 100644 (file)
--- a/sail/pl_main.c
+++ b/sail/pl_main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_main.c,v 1.7 1999/02/10 00:45:46 hubertf Exp $      */
+/*     $NetBSD: pl_main.c,v 1.8 2000/01/31 11:08:53 jsm Exp $  */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_main.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_main.c,v 1.7 1999/02/10 00:45:46 hubertf Exp $");
+__RCSID("$NetBSD: pl_main.c,v 1.8 2000/01/31 11:08:53 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,10 +53,6 @@ int
 pl_main()
 {
 
-       if (!SCREENTEST()) {
-               printf("Can't sail on this terminal.\n");
-               exit(1);
-       }
        initialize();
        Msg("Aye aye, Sir");
        play();