(no message)

[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 80b37a7..f4114e9 100644 (file)
--- a/usr/src/games/cribbage/support.c
+++ b/usr/src/games/cribbage/support.c
@@ -1,3 +1,5 @@
+static char    *sccsid = "@(#)support.c        1.13 (Berkeley) %G%";
+

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


@@ -79,32 +81,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);
-       sprintf(prompt, "Your %s scores ", s);
-       i = scorehand(hand, turnover, CINHAND, FALSE);  /* 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);
+    sprintf(prompt, "Your %s scores ", s);
+    i = scorehand(hand, turnover, CINHAND, strcmp(s, "crib"), 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 +120,8 @@ char                *s;
 {
        register int            j;
 
 {
        register int            j;
 

-       j = scorehand(h, turnover, CINHAND, FALSE);
-       prhand(h, CINHAND, Compwin);
-       Hasread = FALSE;
+       j = scorehand(h, turnover, CINHAND, FALSE, FALSE);
+       prhand(h, CINHAND, Compwin, 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);
 }


@@ -130,7 +132,7 @@ char                *s;
  *     board while we're at it.
  */
 
  *     board while we're at it.
  */
 

-int    Lastscore[2] = {0, 0};
+int    Lastscore[2] = {-1, -1};

 
 chkscr(scr, inc)
 int            *scr, inc;
 
 chkscr(scr, inc)
 int            *scr, inc;


@@ -141,15 +143,17 @@ int               *scr, inc;
        if (inc != 0) {
                prpeg(Lastscore[myturn], '.', myturn);
                Lastscore[myturn] = *scr;
        if (inc != 0) {
                prpeg(Lastscore[myturn], '.', myturn);
                Lastscore[myturn] = *scr;

+               *scr += inc;
+               prpeg(*scr, PEG, myturn);
+               refresh();

        }
        }

-       *scr += inc;
-       prpeg(*scr, PEG, myturn);
-       return (*scr > glimit);
+       return (*scr >= glimit);

 }
 
 /*
  * prpeg:
 }
 
 /*
  * 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;


@@ -158,20 +162,32 @@ BOOLEAN           myturn;
 {
        register int    y, x;
 
 {
        register int    y, x;
 

-       if (score == 0 || score > glimit)
-               return;

        if (!myturn)
                y = SCORE_Y + 2;
        else
                y = SCORE_Y + 5;
        if (!myturn)
                y = SCORE_Y + 2;
        else
                y = SCORE_Y + 5;

-       x = (score - 1) % 30;
-       if (score > 90 || (score > 30 && score <= 60)) {
-               y++;
-               x = 29 - x;
+
+       if (score <= 0 || score >= glimit) {
+               if (peg == '.')
+                       peg = ' ';
+               if (score == 0)
+                       x = SCORE_X + 2;
+               else {
+                       x = SCORE_X + 2;
+                       y++;
+               }
+       }
+       else {
+               x = (score - 1) % 30;
+               if (score > 90 || (score > 30 && score <= 60)) {
+                       y++;
+                       x = 29 - x;
+               }
+               x += x / 5;
+               x += SCORE_X + 3;

        }
        }

-       x += x / 5;
-       x += SCORE_X + 3;

        mvaddch(y, x, peg);
        mvaddch(y, x, peg);

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

 }
 
 /*
 }
 
 /*


@@ -205,7 +221,7 @@ cdiscard( mycrib )
                remove( chand[i], h, FULLHAND );
                remove( chand[j], h, FULLHAND - 1 );
                for( k = 0; k < nc; k++ )  {
                remove( chand[i], h, FULLHAND );
                remove( chand[j], h, FULLHAND - 1 );
                for( k = 0; k < nc; k++ )  {

-                   sums[ns] += scorehand( h, d[k], CINHAND, TRUE );
+                   sums[ns] += scorehand( h, d[k], CINHAND, TRUE, FALSE );

                    if( mycrib )  sums[ns] += adjust( cb, d[k] );
                    else          sums[ns] -= adjust( cb, d[k] );
                }
                    if( mycrib )  sums[ns] += adjust( cb, d[k] );
                    else          sums[ns] -= adjust( cb, d[k] );
                }