ANSIfication; bug report 4.3BSD/bin/223

[unix-history] / usr / src / games / cribbage / support.c

diff --git a/usr/src/games/cribbage/support.c b/usr/src/games/cribbage/support.c
index 2352b99..1844588 100644 (file)
--- a/usr/src/games/cribbage/support.c
+++ b/usr/src/games/cribbage/support.c
@@ -1,3 +1,24 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)support.c  5.4 (Berkeley) %G%";
+#endif /* not lint */
+

 #include       <curses.h>
 #include       "deck.h"
 #include       "cribbage.h"
 #include       <curses.h>
 #include       "deck.h"
 #include       "cribbage.h"


@@ -79,32 +100,33 @@ plyrhand(hand, s)
 CARD           hand[];
 char           *s;
 {
 CARD           hand[];
 char           *s;
 {

-       register int            i, j;
-       BOOLEAN                 win;
-       static char             prompt[BUFSIZ];
-
-       prhand(hand, CINHAND, Playwin, FALSE);
-       sprintf(prompt, "Your %s scores ", s);
-       i = scorehand(hand, turnover, CINHAND, FALSE, explain); /* count */
-       if ((j = number(0, 29, prompt)) == 19)
-           j = 0;
-       if (i != j) {
-           if (i < j) {
-               win = chkscr(&pscore, i);
-               msg("It's really only %d points, I get %d.", i, 2);
-               if (!win)
-                   win = chkscr(&cscore, 2);
-           }
-           else {
-               win = chkscr(&pscore, j);
-               msg("You should have taken %d, not %d!", i, j);
-           }
-           if (explain)
-               msg("Explanation: %s", expl);
-       }
-       else
+    register int       i, j;
+    register BOOLEAN   win;
+    static char                prompt[BUFSIZ];
+
+    prhand(hand, CINHAND, Playwin, FALSE);
+    (void)sprintf(prompt, "Your %s scores ", s);
+    i = scorehand(hand, turnover, CINHAND, strcmp(s, "crib") == 0, explain);
+    if ((j = number(0, 29, prompt)) == 19)
+       j = 0;
+    if (i != j) {
+       if (i < j) {

            win = chkscr(&pscore, i);
            win = chkscr(&pscore, i);

-       return win;
+           msg("It's really only %d points; I get %d", i, 2);
+           if (!win)
+               win = chkscr(&cscore, 2);
+       }
+       else {
+           win = chkscr(&pscore, j);
+           msg("You should have taken %d, not %d!", i, j);
+       }
+       if (explain)
+           msg("Explanation: %s", expl);
+       do_wait();
+    }
+    else
+       win = chkscr(&pscore, i);
+    return win;

 }
 
 /*
 }
 
 /*


@@ -117,9 +139,8 @@ char                *s;
 {
        register int            j;
 
 {
        register int            j;
 

-       j = scorehand(h, turnover, CINHAND, FALSE, FALSE);
+       j = scorehand(h, turnover, CINHAND, strcmp(s, "crib") == 0, FALSE);

        prhand(h, CINHAND, Compwin, FALSE);
        prhand(h, CINHAND, Compwin, FALSE);

-       Hasread = FALSE;

        msg("My %s scores %d", s, (j == 0 ? 19 : j));
        return chkscr(&cscore, j);
 }
        msg("My %s scores %d", s, (j == 0 ? 19 : j));
        return chkscr(&cscore, j);
 }


@@ -143,13 +164,15 @@ int               *scr, inc;
                Lastscore[myturn] = *scr;
                *scr += inc;
                prpeg(*scr, PEG, myturn);
                Lastscore[myturn] = *scr;
                *scr += inc;
                prpeg(*scr, PEG, myturn);

+               refresh();

        }
        return (*scr >= glimit);
 }
 
 /*
  * prpeg:
        }
        return (*scr >= glimit);
 }
 
 /*
  * prpeg:

- *     put out the peg character on the score board
+ *     Put out the peg character on the score board and put the
+ *     score up on the board.

  */
 prpeg(score, peg, myturn)
 register int   score;
  */
 prpeg(score, peg, myturn)
 register int   score;


@@ -183,6 +206,7 @@ BOOLEAN             myturn;
                x += SCORE_X + 3;
        }
        mvaddch(y, x, peg);
                x += SCORE_X + 3;
        }
        mvaddch(y, x, peg);

+       mvprintw(SCORE_Y + (myturn ? 7 : 1), SCORE_X + 10, "%3d", score);

 }
 
 /*
 }
 
 /*