Move UCB-licensed code from 4-clause to 3-clause licence.

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

diff --git a/sail/pl_7.c b/sail/pl_7.c
index 1660761f4f07f8d249845db2f60b839831957d12..4a3bd62d9483a24770d61c5fd8ecd2d7b4f84aa2 100644 (file)
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl_7.c,v 1.24 2001/02/05 01:10:11 christos Exp $       */
+/*     $NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_7.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_7.c,v 1.24 2001/02/05 01:10:11 christos Exp $");
+__RCSID("$NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -101,7 +97,7 @@ initscreen(void)
        leaveok(stat_w, 1);
        leaveok(turn_w, 1);
        noecho();
-       crmode();
+       cbreak();
 }
 
 void
@@ -178,9 +174,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);
@@ -195,9 +191,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);