Slipstream in Larry Schwimmer's input fix.

[wumpus.git] / wumpus.c

diff --git a/wumpus.c b/wumpus.c
index 21e56e8eb82c9791cd93a06cdc69031318fb7d60..bf9f0a6534955fc784c927f5d2fcdcf9b1d65806 100644 (file)
--- a/wumpus.c
+++ b/wumpus.c
@@ -1,8 +1,8 @@
 /*
  * wumpus.c --- a faithful translation of the classic "Hunt The Wumpus" game.
  *
- * Translator: Eric S. Raymond <eric@snark.thyrsus.com>
- * Version: $Id$
+ * Translator: Eric S. Raymond <esr@snark.thyrsus.com>
+ * Version: $Id: wumpus.c,v 1.3 1993/11/07 19:19:27 esr Exp esr $
  *
  * This was the state of the art 20 years ago, in 1972.  We've come a long
  * way, baby.
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+#include <ctype.h>
 
 /* 5 REM *** HUNT THE WUMPUS ***                                       */
 
@@ -102,16 +103,24 @@ int getnum(prompt)
 char *prompt;
 {
     (void) printf("%s\n?", prompt);
-    (void) fgets(inp, sizeof(inp), stdin);
-    return(atoi(inp));
+    if (fgets(inp, sizeof(inp), stdin))
+      return(atoi(inp));
+    else {
+      fputs("\n",stdout);
+      exit(1);
+    }
 }
 
 int getlet(prompt)
 char *prompt;
 {
     (void) printf("%s\n?", prompt);
-    (void) fgets(inp, sizeof(inp), stdin);
-    return(inp[0]);    
+    if (fgets(inp, sizeof(inp), stdin))
+      return(toupper(inp[0]));
+    else {
+      fputs("\n",stdout);
+      exit(1);
+    }
 }
 
 void print_instructions()
@@ -342,9 +351,7 @@ badrange:
 
                /* this simulates logic at 895 in the BASIC code */
                check_shot();
-               if (finished == NOT)
-                   goto ammo;
-               else
+               if (finished != NOT)
                    return;
            }
 
@@ -511,7 +518,8 @@ goodmove:
        /* 1145 RETURN                                                  */
        /* 1150 END                                                     */
        (void) puts("ZAP--SUPER BAT SNATCH! ELSEWHEREVILLE FOR YOU!");
-       loc[YOU] = FNA();
+       scratchloc = loc[YOU] = FNA();
+       goto goodmove;
     }
 }
 
@@ -521,10 +529,10 @@ char *argv[];
 {
     int        c;
 
-    if (strcmp(argv[1], "-s") == 0)
-       srand(atol(argv[2]));
+    if (argc >= 2 && strcmp(argv[1], "-s") == 0)
+       srand(atoi(argv[2]));
     else
-       srand(time((long *) 0));
+       srand((int)time((long *) 0));
 
     /* 15 PRINT "INSTRUCTIONS (Y-N)";                                  */
     /* 20 INPUT I$                                                     */