X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/462fca95471224f85b85be911e72faee16cd1597..faf223d8ff53d6c00e68c131d5db42c1af950894:/hangman/getguess.c

diff --git a/hangman/getguess.c b/hangman/getguess.c
index 53848c0c..4f248bda 100644
--- a/hangman/getguess.c
+++ b/hangman/getguess.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: getguess.c,v 1.7 1997/10/11 01:16:29 lukem 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
@@ -31,22 +33,28 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)getguess.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: getguess.c,v 1.2 1993/08/01 18:54:26 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)getguess.c	8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: getguess.c,v 1.7 1997/10/11 01:16:29 lukem Exp $");
+#endif
 #endif /* not lint */
 
-# include	"hangman.h"
+#include <sys/ttydefaults.h>
+#include "hangman.h"
 
 /*
  * getguess:
  *	Get another guess
  */
+void
 getguess()
 {
-	register int	i;
-	register int	ch;
-	register bool	correct;
+	int i;
+	int ch;
+	bool correct;
 
 	leaveok(stdscr, FALSE);
 	for (;;) {
@@ -57,15 +65,16 @@ getguess()
 			if (isupper(ch))
 				ch = tolower(ch);
 			if (Guessed[ch - 'a'])
-				mvprintw(MESGY, MESGX, "Already guessed '%c'", ch);
+				mvprintw(MESGY, MESGX, "Already guessed '%c'",
+				    ch);
 			else
 				break;
-		}
-		else if (ch == CTRL('D'))
-			die();
-		else
-			mvprintw(MESGY, MESGX, "Not a valid guess: '%s'",
-				unctrl(ch));
+		} else
+			if (ch == CTRL('D'))
+				die(0);
+			else
+				mvprintw(MESGY, MESGX,
+				    "Not a valid guess: '%s'", unctrl(ch));
 	}
 	leaveok(stdscr, TRUE);
 	move(MESGY, MESGX);
@@ -81,28 +90,25 @@ getguess()
 	if (!correct)
 		Errors++;
 }
-
 /*
  * readch;
  *	Read a character from the input
  */
+int
 readch()
 {
-	register int	cnt, r;
-	auto char	ch;
+	int cnt;
+	char ch;
 
 	cnt = 0;
 	for (;;) {
-		if (read(0, &ch, sizeof ch) <= 0)
-		{
+		if (read(0, &ch, sizeof ch) <= 0) {
 			if (++cnt > 100)
-				die();
-		}
-		else if (ch == CTRL('L')) {
-			wrefresh(curscr);
-			mvcur(0, 0, curscr->_cury, curscr->_curx);
-		}
-		else
-			return ch;
+				die(0);
+		} else
+			if (ch == CTRL('L')) {
+				wrefresh(curscr);
+			} else
+				return ch;
 	}
 }