Merge upstream (can't test, hopefully nothing broke)

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

diff --git a/monop/morg.c b/monop/morg.c
index 80860f63838f39e1e2372ee5afaff4eb5545c959..74da5151d99f307200c183087423e2edd40931a7 100644 (file)
--- a/monop/morg.c
+++ b/monop/morg.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: morg.c,v 1.7 1999/08/21 10:40:04 simonb Exp $  */
+/*     $NetBSD: morg.c,v 1.19 2012/06/19 05:35:32 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -38,18 +34,18 @@
 #if 0
 static char sccsid[] = "@(#)morg.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: morg.c,v 1.7 1999/08/21 10:40:04 simonb Exp $");
+__RCSID("$NetBSD: morg.c,v 1.19 2012/06/19 05:35:32 dholland Exp $");
 #endif
 #endif /* not lint */
 
-#include "monop.ext"
+#include "monop.h"
 
 /*
  *     These routines deal with mortgaging.
  */
 
-static char    *names[MAX_PRP+2],
-               *morg_coms[]    = {
+static const char      *names[MAX_PRP+2],
+               *const morg_coms[]      = {
                        "quit",         /*  0 */
                        "print",        /*  1 */
                        "where",        /*  2 */
@@ -70,14 +66,13 @@ static char *names[MAX_PRP+2],
 
 static short   square[MAX_PRP+2];
 
-static int     num_good,got_houses;
+static int     num_good, got_houses;
 
 
-static int set_mlist __P((void));
-static void m __P((int));
-static int set_umlist __P((void));
-static void unm __P((int));
-static void fix_ex __P((int));
+static int set_mlist(void);
+static void m(int);
+static int set_umlist(void);
+static void unm(int);
 
 /*
  *     This routine is the command level response the mortgage command.
@@ -85,9 +80,9 @@ static void fix_ex __P((int));
  * be mortgaged.
  */
 void
-mortgage()
+mortgage(void)
 {
-       int prop;
+       int propnum;
 
        for (;;) {
                if (set_mlist() == 0) {
@@ -100,16 +95,17 @@ mortgage()
                        return;
                }
                if (num_good == 1) {
-                       printf("Your only mortageable property is %s\n",
+                       printf("Your only mortgageable property is %s\n",
                            names[0]);
                        if (getyn("Do you want to mortgage it? ") == 0)
                                m(square[0]);
                        return;
                }
-               prop = getinp("Which property do you want to mortgage? ",names);
-               if (prop == num_good)
+               propnum = getinp("Which property do you want to mortgage? ",
+                               names);
+               if (propnum == num_good)
                        return;
-               m(square[prop]);
+               m(square[propnum]);
                notify();
        }
 }
@@ -118,7 +114,7 @@ mortgage()
  *     This routine sets up the list of mortgageable property
  */
 static int
-set_mlist()
+set_mlist(void)
 {
        OWN *op;
 
@@ -141,13 +137,12 @@ set_mlist()
  *     This routine actually mortgages the property.
  */
 static void
-m(prop)
-       int prop;
+m(int propnum)
 {
        int price;
 
-       price = board[prop].cost/2;
-       board[prop].desc->morg = TRUE;
+       price = board[propnum].cost/2;
+       board[propnum].desc->morg = TRUE;
        printf("That got you $%d\n",price);
        cur_p->money += price;
 }
@@ -158,9 +153,9 @@ m(prop)
  * to be unmortgaged.
  */
 void
-unmortgage() 
+unmortgage(void)
 {
-       int prop;
+       int propnum;
 
        for (;;) {
                if (set_umlist() == 0) {
@@ -168,16 +163,17 @@ unmortgage()
                        return;
                }
                if (num_good == 1) {
-                       printf("Your only mortaged property is %s\n",names[0]);
+                       printf("Your only mortgaged property is %s\n",
+                           names[0]);
                        if (getyn("Do you want to unmortgage it? ") == 0)
                                unm(square[0]);
                        return;
                }
-               prop = getinp("Which property do you want to unmortgage? ",
+               propnum = getinp("Which property do you want to unmortgage? ",
                    names);
-               if (prop == num_good)
+               if (propnum == num_good)
                        return;
-               unm(square[prop]);
+               unm(square[propnum]);
        }
 }
 
@@ -185,7 +181,7 @@ unmortgage()
  *     This routine sets up the list of mortgaged property
  */
 static int
-set_umlist()
+set_umlist(void)
 {
        OWN *op;
 
@@ -204,40 +200,30 @@ set_umlist()
  *     This routine actually unmortgages the property
  */
 static void
-unm(prop)
-       int prop; 
+unm(int propnum)
 {
        int price;
 
-       price = board[prop].cost/2;
-       board[prop].desc->morg = FALSE;
+       price = board[propnum].cost/2;
+       board[propnum].desc->morg = FALSE;
        price += price/10;
        printf("That cost you $%d\n",price);
        cur_p->money -= price;
-       set_umlist();
+       (void)set_umlist();
 }
 
 /*
  *     This routine forces the indebted player to fix his
- * financial woes.
+ * financial woes.  It is fine to have $0 but not to be in debt.
  */
 void
-force_morg()
+force_morg(void)
 {
        told_em = fixing = TRUE;
-       while (cur_p->money <= 0)
-               fix_ex(getinp("How are you going to fix it up? ",morg_coms));
+       while (cur_p->money < 0) {
+               told_em = FALSE;
+               (*func[(getinp("How are you going to fix it up? ", morg_coms))])();
+               notify();
+       }
        fixing = FALSE;
 }
-
-/*
- *     This routine is a special execute for the force_morg routine
- */
-static void
-fix_ex(com_num)
-       int com_num;
-{
-       told_em = FALSE;
-       (*func[com_num])();
-       notify();
-}