Fixes from OpenBSD.

[bsdgames-darwin.git] / monop / trade.c

diff --git a/monop/trade.c b/monop/trade.c
index 1d210a43fad628ee61889ee05d1c1d6517ab6d4b..4e130af3385ef9db01da07944a02aa3f6b9c5323 100644 (file)
--- a/monop/trade.c
+++ b/monop/trade.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: trade.c,v 1.12 2008/02/19 10:48:47 dholland Exp $      */
+/*     $NetBSD: trade.c,v 1.13 2008/02/23 22:28:46 dholland Exp $      */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)trade.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: trade.c,v 1.12 2008/02/19 10:48:47 dholland Exp $");
+__RCSID("$NetBSD: trade.c,v 1.13 2008/02/23 22:28:46 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -252,6 +252,9 @@ resign()
                  case RR:
                  case PRPTY:
                        new_own = board[cur_p->loc].owner;
+                       /* If you ran out of money by buying current location */
+                       if (new_own == player)
+                               new_own = num_play;
                        break;
                  default:              /* Chance, taxes, etc */
                        new_own = num_play;
@@ -307,16 +310,19 @@ resign()
                if (cur_p->num_gojf)
                        ret_card(cur_p);
        }
+#if 0 /* notyet */
+       free(name_list[player]);
+#endif
        for (i = player; i < num_play; i++) {
                name_list[i] = name_list[i+1];
                if (i + 1 < num_play)
                        play[i] = play[i+1];
        }
-       name_list[num_play--] = 0;
+       name_list[num_play--] = NULL;
        for (i = 0; i < N_SQRS; i++)
                if (board[i].owner > player)
                        --board[i].owner;
-       player = --player < 0 ? num_play - 1 : player;
+       player = player == 0 ? num_play - 1 : player - 1;
        next_play();
        if (num_play < 2) {
                printf("\nThen %s WINS!!!!!\n", play[0].name);