BSD 4_3_Tahoe release

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

diff --git a/usr/src/games/monop/trade.c b/usr/src/games/monop/trade.c
index 70e8c5a..de8d0f9 100644 (file)
--- a/usr/src/games/monop/trade.c
+++ b/usr/src/games/monop/trade.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[] = "@(#)trade.c    5.3 (Berkeley) 6/18/88";
+#endif /* not lint */
+

 # include      "monop.ext"
 
 static struct  trd_st {        /* how much to give to other player     */
 # include      "monop.ext"
 
 static struct  trd_st {        /* how much to give to other player     */


@@ -194,9 +215,7 @@ resign() {
                  case PRPTY:
                        new_own = board[cur_p->loc].owner;
                        break;
                  case PRPTY:
                        new_own = board[cur_p->loc].owner;
                        break;

-                 case SPEC:
-                 case CC:
-                 case CHANCE:
+                 default:              /* Chance, taxes, etc */

                        new_own = num_play;
                        break;
                }
                        new_own = num_play;
                        break;
                }


@@ -242,7 +261,7 @@ resign() {
                        sqp = op->sqr;
                        sqp->owner = -1;
                        sqp->desc->morg = FALSE;
                        sqp = op->sqr;
                        sqp->owner = -1;
                        sqp->desc->morg = FALSE;

-                       if (op->type == PRPTY) {
+                       if (sqp->type == PRPTY) {

                                isnot_monop(sqp->desc->mon_desc);
                                sqp->desc->houses = 0;
                        }
                                isnot_monop(sqp->desc->mon_desc);
                                sqp->desc->houses = 0;
                        }