BSD 4_3_Net_2 release

[unix-history] / usr / src / games / sail / pl_7.c

diff --git a/usr/src/games/sail/pl_7.c b/usr/src/games/sail/pl_7.c
index c0408d3..136db8b 100644 (file)
--- a/usr/src/games/sail/pl_7.c
+++ b/usr/src/games/sail/pl_7.c
@@ -1,12 +1,39 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pl_7.c     5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)pl_7.c     5.7 (Berkeley) 2/28/91";
+#endif /* not lint */

 
 #include "player.h"
 
 
 #include "player.h"
 


@@ -34,7 +61,7 @@ initscreen()
        (void) leaveok(turn_w, 1);
 #ifdef SIGTSTP
        {
        (void) leaveok(turn_w, 1);
 #ifdef SIGTSTP
        {

-               int susp();
+               void susp();

                (void) signal(SIGTSTP, susp);
        }
 #endif
                (void) signal(SIGTSTP, susp);
        }
 #endif


@@ -53,6 +80,7 @@ cleanupscreen()
        }
 }
 
        }
 }
 

+void

 newturn()
 {
        repaired = loaded = fired = changed = 0;
 newturn()
 {
        repaired = loaded = fired = changed = 0;


@@ -207,7 +235,7 @@ register n;
                                *p++ = c;
                                (void) waddch(scroll_w, c);
                        } else
                                *p++ = c;
                                (void) waddch(scroll_w, c);
                        } else

-                               (void) putchar(CTRL(g));
+                               (void) putchar(CTRL('g'));

                }
        }
 }
                }
        }
 }


@@ -442,6 +470,7 @@ adjustview()
 }
 
 #ifdef SIGTSTP
 }
 
 #ifdef SIGTSTP

+void

 susp()
 {
        blockalarm();
 susp()
 {
        blockalarm();