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 e56ef7b0254e89c085d77d452e84f4ac5e5f727f..74da5151d99f307200c183087423e2edd40931a7 100644 (file)
--- a/monop/morg.c
+++ b/monop/morg.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: morg.c,v 1.17 2008/02/24 02:55:20 dholland Exp $       */
+/*     $NetBSD: morg.c,v 1.19 2012/06/19 05:35:32 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)morg.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: morg.c,v 1.17 2008/02/24 02:55:20 dholland Exp $");
+__RCSID("$NetBSD: morg.c,v 1.19 2012/06/19 05:35:32 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -80,7 +80,7 @@ static void unm(int);
  * be mortgaged.
  */
 void
-mortgage()
+mortgage(void)
 {
        int propnum;
 
@@ -114,7 +114,7 @@ mortgage()
  *     This routine sets up the list of mortgageable property
  */
 static int
-set_mlist()
+set_mlist(void)
 {
        OWN *op;
 
@@ -137,8 +137,7 @@ set_mlist()
  *     This routine actually mortgages the property.
  */
 static void
-m(propnum)
-       int propnum;
+m(int propnum)
 {
        int price;
 
@@ -154,7 +153,7 @@ m(propnum)
  * to be unmortgaged.
  */
 void
-unmortgage()
+unmortgage(void)
 {
        int propnum;
 
@@ -182,7 +181,7 @@ unmortgage()
  *     This routine sets up the list of mortgaged property
  */
 static int
-set_umlist()
+set_umlist(void)
 {
        OWN *op;
 
@@ -201,8 +200,7 @@ set_umlist()
  *     This routine actually unmortgages the property
  */
 static void
-unm(propnum)
-       int propnum;
+unm(int propnum)
 {
        int price;
 
@@ -211,7 +209,7 @@ unm(propnum)
        price += price/10;
        printf("That cost you $%d\n",price);
        cur_p->money -= price;
-       set_umlist();
+       (void)set_umlist();
 }
 
 /*
@@ -219,7 +217,7 @@ unm(propnum)
  * 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) {