[src/trunk]: src/games/fish [fish] don't allow users to request cards they ha...

[eadler <eadler%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3a1dbc8e1461
branches:  trunk
changeset: 360039:3a1dbc8e1461
user:      eadler <eadler%NetBSD.org@localhost>
date:      Mon Mar 05 04:59:54 2018 +0000

description:
[fish] don't allow users to request cards they have made books for

While here, don't re-renter pro mode

PR bin/52973

ok maya@ dh@

diffstat:

 games/fish/fish.c |  22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r bfa0d0b9a10d -r 3a1dbc8e1461 games/fish/fish.c
--- a/games/fish/fish.c Mon Mar 05 04:23:00 2018 +0000
+++ b/games/fish/fish.c Mon Mar 05 04:59:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fish.c,v 1.22 2011/09/01 07:18:50 plunky Exp $ */
+/*     $NetBSD: fish.c,v 1.23 2018/03/05 04:59:54 eadler Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)fish.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fish.c,v 1.22 2011/09/01 07:18:50 plunky Exp $");
+__RCSID("$NetBSD: fish.c,v 1.23 2018/03/05 04:59:54 eadler Exp $");
 #endif
 #endif /* not lint */
 
@@ -171,9 +171,14 @@
                        continue;
                }
                buf[strlen(buf) - 1] = '\0';
-               if (!strcasecmp(buf, "p") && !promode) {
-                       promode = 1;
-                       (void)printf("Entering pro mode.\n");
+               if (!strcasecmp(buf, "p")) {
+                       if (!promode) {
+                               promode = 1;
+                               printf("Entering pro mode.\n");
+                       }
+                       else {
+                               printf("Already in pro mode.\n");
+                       }
                        continue;
                }
                if (!strcasecmp(buf, "quit"))
@@ -186,10 +191,15 @@
                        continue;
                }
                n = p - cards;
-               if (userhand[n]) {
+               if (userhand[n] <= 3) {
                        userasked[n] = 1;
                        return(n);
                }
+               if (userhand[n] == 4) {
+                       printf("You already have all of those.\n");
+                       continue;
+               }
+
                if (nrandom(3) == 1)
                        (void)printf("You don't have any of those!\n");
                else