BSD 4_3_Reno release

[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 8532a4b..32ea5a1 100644 (file)
--- a/usr/src/games/cribbage/support.c
+++ b/usr/src/games/cribbage/support.c
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. Neither the name of the University nor the names of its
+ * contributors may 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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)support.c  5.5 (Berkeley) 6/1/90";
+#endif /* not lint */
+

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


@@ -84,8 +107,8 @@ char         *s;
     static char                prompt[BUFSIZ];
 
     prhand(hand, CINHAND, Playwin, FALSE);
     static char                prompt[BUFSIZ];
 
     prhand(hand, CINHAND, Playwin, FALSE);

-    sprintf(prompt, "Your %s scores ", s);
-    i = scorehand(hand, turnover, CINHAND, strcmp(s, "crib"), explain);
+    (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 ((j = number(0, 29, prompt)) == 19)
        j = 0;
     if (i != j) {


@@ -118,7 +141,7 @@ 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);
        msg("My %s scores %d", s, (j == 0 ? 19 : j));
        return chkscr(&cscore, j);
        prhand(h, CINHAND, Compwin, FALSE);
        msg("My %s scores %d", s, (j == 0 ? 19 : j));
        return chkscr(&cscore, j);