BSD 4_3_Net_2 release

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

diff --git a/usr/src/games/cribbage/crib.c b/usr/src/games/cribbage/crib.c
index 7c73764..d1d8bc7 100644 (file)
--- a/usr/src/games/cribbage/crib.c
+++ b/usr/src/games/cribbage/crib.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -24,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)crib.c     5.5 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)crib.c     5.6 (Berkeley) 2/28/91";

 #endif /* not lint */
 
 # include      <sys/signal.h>
 #endif /* not lint */
 
 # include      <sys/signal.h>


@@ -318,12 +332,12 @@ BOOLEAN           mycrib;
        prompt = (quiet ? "Discard --> " : "Discard a card --> ");
        cdiscard(mycrib);                       /* puts best discard at end */
        crd = phand[infrom(phand, FULLHAND, prompt)];
        prompt = (quiet ? "Discard --> " : "Discard a card --> ");
        cdiscard(mycrib);                       /* puts best discard at end */
        crd = phand[infrom(phand, FULLHAND, prompt)];

-       remove(crd, phand, FULLHAND);
+       cremove(crd, phand, FULLHAND);

        prhand(phand, FULLHAND, Playwin, FALSE);
        crib[0] = crd;
 /* next four lines same as last four except for cdiscard() */
        crd = phand[infrom(phand, FULLHAND - 1, prompt)];
        prhand(phand, FULLHAND, Playwin, FALSE);
        crib[0] = crd;
 /* next four lines same as last four except for cdiscard() */
        crd = phand[infrom(phand, FULLHAND - 1, prompt)];

-       remove(crd, phand, FULLHAND - 1);
+       cremove(crd, phand, FULLHAND - 1);

        prhand(phand, FULLHAND, Playwin, FALSE);
        crib[1] = crd;
        crib[2] = chand[4];
        prhand(phand, FULLHAND, Playwin, FALSE);
        crib[1] = crd;
        crib[2] = chand[4];


@@ -465,7 +479,7 @@ BOOLEAN             mycrib;
                    if (j < 0)                          /* if nothing scores */
                        j = cchose(ch, cnum, sum);
                    crd = ch[j];
                    if (j < 0)                          /* if nothing scores */
                        j = cchose(ch, cnum, sum);
                    crd = ch[j];

-                   remove(crd, ch, cnum--);
+                   cremove(crd, ch, cnum--);

                    sum += VAL(crd.rank);
                    Table[Tcnt++] = crd;
                    if (k > 0) {
                    sum += VAL(crd.rank);
                    Table[Tcnt++] = crd;
                    if (k > 0) {


@@ -513,7 +527,7 @@ BOOLEAN             mycrib;
                                msg("Total > 31 -- try again");
                        }
                    makeknown(&crd, 1);
                                msg("Total > 31 -- try again");
                        }
                    makeknown(&crd, 1);

-                   remove(crd, ph, pnum--);
+                   cremove(crd, ph, pnum--);

                    i = pegscore(crd, Table, Tcnt, sum);
                    sum += VAL(crd.rank);
                    Table[Tcnt++] = crd;
                    i = pegscore(crd, Table, Tcnt, sum);
                    sum += VAL(crd.rank);
                    Table[Tcnt++] = crd;