Fix merge conflicts

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

diff --git a/hangman/playgame.c b/hangman/playgame.c
index 5a591520d718e12d82db069b8f342295bfec757f..f18923d85389e8a49905c0fb72d81ad9a7158b8d 100644 (file)
--- a/hangman/playgame.c
+++ b/hangman/playgame.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: playgame.c,v 1.3 1995/03/23 08:32:53 cgd Exp $ */
+/*     $NetBSD: playgame.c,v 1.7 2012/10/13 21:01:13 dholland 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.
  *
@@ -33,30 +29,32 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)playgame.c 8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: playgame.c,v 1.3 1995/03/23 08:32:53 cgd Exp $";
+__RCSID("$NetBSD: playgame.c,v 1.7 2012/10/13 21:01:13 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "hangman.h"
+#include       "hangman.h"
 
 /*
  * playgame:
  *     play a game
  */
-playgame()
+void
+playgame(void)
 {
-       register bool   *bp;
+       int i;
 
        getword();
        Errors = 0;
-       bp = Guessed;
-       while (bp < &Guessed[26])
-               *bp++ = FALSE;
-       while (Errors < MAXERRS && index(Known, '-') != NULL) {
+       for (i=0; i<26; i++) {
+               Guessed[i] = false;
+       }
+       while (Errors < MAXERRS && strchr(Known, '-') != NULL) {
                prword();
                prdata();
                prman();