BSD 4_3_Net_2 release

[unix-history] / usr / src / games / monop / prop.c

diff --git a/usr/src/games/monop/prop.c b/usr/src/games/monop/prop.c
index 846f2ff..86c1595 100644 (file)
--- a/usr/src/games/monop/prop.c
+++ b/usr/src/games/monop/prop.c
@@ -1,5 +1,44 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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
+static char sccsid[] = "@(#)prop.c     5.6 (Berkeley) 6/1/90";
+#endif /* not lint */
+

 # include      "monop.ext"
 
 # include      "monop.ext"
 

+extern char *calloc();
+

 /*
  *     This routine deals with buying property, setting all the
  * appropriate flags.
 /*
  *     This routine deals with buying property, setting all the
  * appropriate flags.


@@ -25,7 +64,7 @@ int   op_sqr; {
        MON     *mp;
        OWN     *op;
 
        MON     *mp;
        OWN     *op;
 

-       op = calloc(1, sizeof (OWN));
+       op = (OWN *)calloc(1, sizeof (OWN));

        op->sqr = &board[op_sqr];
        val = value(op->sqr);
        last_tp = NULL;
        op->sqr = &board[op_sqr];
        val = value(op->sqr);
        last_tp = NULL;


@@ -92,7 +131,7 @@ reg SQUARE   *sqp; {
        switch (sqp->type) {
          case SAFE:
                return 0;
        switch (sqp->type) {
          case SAFE:
                return 0;

-         case SPEC:
+         default:              /* Specials, etc */

                return 1;
          case UTIL:
                if (sqr == 12)
                return 1;
          case UTIL:
                if (sqr == 12)


@@ -102,7 +141,7 @@ reg SQUARE  *sqp; {
          case RR:
                return 4 + sqr/10;
          case PRPTY:
          case RR:
                return 4 + sqr/10;
          case PRPTY:

-               return 8 + (PROP *)(sqp->desc) - prop;
+               return 8 + (sqp->desc) - prop;

        }
 }
 /*
        }
 }
 /*


@@ -126,7 +165,7 @@ bid() {
                i = ++i % num_play;
                if (in[i]) {
                        do {
                i = ++i % num_play;
                if (in[i]) {
                        do {

-                               sprintf(buf, "%s: ", name_list[i]);
+                               (void)sprintf(buf, "%s: ", name_list[i]);

                                cur_bid = get_int(buf);
                                if (cur_bid == 0) {
                                        in[i] = FALSE;
                                cur_bid = get_int(buf);
                                if (cur_bid == 0) {
                                        in[i] = FALSE;