Fix merge conflicts

[bsdgames-darwin.git] / hangman / endgame.c

diff --git a/hangman/endgame.c b/hangman/endgame.c
index 4b08d53276c6f8d03c33d578fa55a3b93182b0a9..e9b3fb63654a68b37edb289deb134961ed2b06f8 100644 (file)
--- a/hangman/endgame.c
+++ b/hangman/endgame.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: endgame.c,v 1.6 2012/06/19 05:45:00 dholland Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,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.
  *
@@ -31,19 +29,25 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)endgame.c  5.3 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)endgame.c  8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: endgame.c,v 1.6 2012/06/19 05:45:00 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "hangman.h"
+#include       "hangman.h"
 
 /*
  * endgame:
  *     Do what's necessary at the end of the game
  */
-endgame()
+void
+endgame(void)
 {
-       register char   ch;
+       char ch;
 
        prman();
        if (Errors >= MAXERRS)
@@ -61,13 +65,16 @@ endgame()
                leaveok(stdscr, FALSE);
                refresh();
                if ((ch = readch()) == 'n')
-                       die();
-               else if (ch == 'y')
-                       break;
+                       die(0);
+               else
+                       if (ch == 'y')
+                               break;
                mvaddstr(MESGY + 2, MESGX, "Please type 'y' or 'n'");
        }
 
        leaveok(stdscr, TRUE);
        move(MESGY, MESGX);
-       addstr("\n\n\n");
+       deleteln();
+       deleteln();
+       deleteln();
 }