summaryrefslogtreecommitdiffstats
path: root/games/monop
diff options
context:
space:
mode:
authormestre <mestre@openbsd.org>2016-01-08 18:20:33 +0000
committermestre <mestre@openbsd.org>2016-01-08 18:20:33 +0000
commit211c4183895062b2b5d2cd7108ec500b73a28071 (patch)
treeeaee9840402fdda1745dd74f22034bde4ac9a231 /games/monop
parentHeaders cleanup and removal where suitable (diff)
downloadwireguard-openbsd-211c4183895062b2b5d2cd7108ec500b73a28071.tar.xz
wireguard-openbsd-211c4183895062b2b5d2cd7108ec500b73a28071.zip
ANSIfy monop(6)
OK tb@
Diffstat (limited to 'games/monop')
-rw-r--r--games/monop/cards.c15
-rw-r--r--games/monop/execute.c23
-rw-r--r--games/monop/getinp.c8
-rw-r--r--games/monop/houses.c22
-rw-r--r--games/monop/initdeck.c14
-rw-r--r--games/monop/jail.c11
-rw-r--r--games/monop/misc.c28
-rw-r--r--games/monop/monop.c12
-rw-r--r--games/monop/morg.c18
-rw-r--r--games/monop/print.c16
-rw-r--r--games/monop/prop.c24
-rw-r--r--games/monop/rent.c5
-rw-r--r--games/monop/roll.c5
-rw-r--r--games/monop/spec.c12
-rw-r--r--games/monop/trade.c19
15 files changed, 93 insertions, 139 deletions
diff --git a/games/monop/cards.c b/games/monop/cards.c
index 994d760d18d..334dbc8a9dc 100644
--- a/games/monop/cards.c
+++ b/games/monop/cards.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cards.c,v 1.11 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: cards.c,v 1.12 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: cards.c,v 1.3 1995/03/23 08:34:35 cgd Exp $ */
/*
@@ -55,7 +55,7 @@ static void printmes(void);
* which it opens.
*/
void
-init_decks()
+init_decks(void)
{
if ((deckf = fopen(cardfile, "r")) == NULL)
file_err:
@@ -85,8 +85,7 @@ file_err:
* This routine sets up the offset pointers for the given deck.
*/
static void
-set_up(dp)
- DECK *dp;
+set_up(DECK *dp)
{
int r1, r2;
int i;
@@ -114,8 +113,7 @@ set_up(dp)
* This routine draws a card from the given deck
*/
void
-get_card(dp)
- DECK *dp;
+get_card(DECK *dp)
{
char type_maj, type_min;
int16_t num;
@@ -216,7 +214,7 @@ get_card(dp)
* This routine prints out the message on the card
*/
static void
-printmes()
+printmes(void)
{
char c;
@@ -234,8 +232,7 @@ printmes()
* deck.
*/
void
-ret_card(plr)
- PLAY *plr;
+ret_card(PLAY *plr)
{
char type_maj;
int16_t gojfpos, last_card;
diff --git a/games/monop/execute.c b/games/monop/execute.c
index 0eb0fb509a3..cdc25ae8158 100644
--- a/games/monop/execute.c
+++ b/games/monop/execute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: execute.c,v 1.12 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: execute.c,v 1.13 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: execute.c,v 1.3 1995/03/23 08:34:38 cgd Exp $ */
/*
@@ -52,7 +52,7 @@ static void show_move(void);
* This routine takes user input and puts it in buf
*/
void
-getbuf()
+getbuf(void)
{
char *sp;
int tmpin, i;
@@ -74,8 +74,7 @@ getbuf()
* This routine executes the given command by index number
*/
void
-execute(com_num)
- int com_num;
+execute(int com_num)
{
new_play = FALSE; /* new_play is true if fixing */
(*func[com_num])();
@@ -90,7 +89,7 @@ execute(com_num)
* This routine moves a piece around.
*/
void
-do_move()
+do_move(void)
{
int r1, r2;
bool was_jail;
@@ -122,8 +121,7 @@ ret:
* This routine moves a normal move
*/
void
-move(rl)
- int rl;
+move(int rl)
{
int old_loc;
@@ -139,7 +137,7 @@ move(rl)
* This routine shows the results of a move
*/
static void
-show_move()
+show_move(void)
{
SQUARE *sqp;
@@ -189,7 +187,7 @@ show_move()
* This routine saves the current game for use at a later date
*/
void
-save()
+save(void)
{
int i, j;
time_t t;
@@ -253,7 +251,7 @@ save()
* If we are restoring during a game, try not to leak memory.
*/
void
-game_restore()
+game_restore(void)
{
int i;
@@ -266,7 +264,7 @@ game_restore()
* This routine restores an old game from a file
*/
void
-restore()
+restore(void)
{
printf("Which file do you wish to restore from? ");
getbuf();
@@ -280,8 +278,7 @@ restore()
* backup was successful, else FALSE.
*/
int
-rest_f(file)
- char *file;
+rest_f(char *file)
{
char *sp;
int i, j, num;
diff --git a/games/monop/getinp.c b/games/monop/getinp.c
index ba2228d78b9..92ea2ab6da9 100644
--- a/games/monop/getinp.c
+++ b/games/monop/getinp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getinp.c,v 1.11 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: getinp.c,v 1.12 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: getinp.c,v 1.4 1995/04/24 12:24:20 cgd Exp $ */
/*
@@ -44,8 +44,7 @@ static char buf[257];
static int comp(char *);
int
-getinp(prompt, list)
- char *prompt, *list[];
+getinp(char *prompt, char *list[])
{
int i, n_match, match;
char *sp;
@@ -97,8 +96,7 @@ getinp(prompt, list)
}
static int
-comp(s1)
- char *s1;
+comp(char *s1)
{
char *sp, *tsp, c;
diff --git a/games/monop/houses.c b/games/monop/houses.c
index 1853e12dbd9..3caf9504b78 100644
--- a/games/monop/houses.c
+++ b/games/monop/houses.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: houses.c,v 1.9 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: houses.c,v 1.10 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: houses.c,v 1.3 1995/03/23 08:34:40 cgd Exp $ */
/*
@@ -51,7 +51,7 @@ static bool can_only_buy_hotel(MON *);
* These routines deal with buying and selling houses
*/
void
-buy_houses()
+buy_houses(void)
{
int num_mon;
MON *mp;
@@ -105,8 +105,7 @@ over:
}
static void
-buy_h(mnp)
- MON *mnp;
+buy_h(MON *mnp)
{
int i;
MON *mp;
@@ -198,7 +197,7 @@ err: printf("That makes the spread too wide. Try again\n");
* This routine sells houses.
*/
void
-sell_houses()
+sell_houses(void)
{
int num_mon;
MON *mp;
@@ -241,8 +240,7 @@ over:
}
static void
-sell_h(mnp)
- MON *mnp;
+sell_h(MON *mnp)
{
int i;
MON *mp;
@@ -299,8 +297,7 @@ err: printf("That makes the spread too wide. Try again\n");
}
static void
-list_cur(mp)
- MON *mp;
+list_cur(MON *mp)
{
int i;
SQUARE *sqp;
@@ -316,7 +313,7 @@ list_cur(mp)
}
static int
-avail_houses()
+avail_houses(void)
{
int i, c;
SQUARE *sqp;
@@ -333,7 +330,7 @@ avail_houses()
}
static int
-avail_hotels()
+avail_hotels(void)
{
int i, c;
SQUARE *sqp;
@@ -350,8 +347,7 @@ avail_hotels()
}
static bool
-can_only_buy_hotel(mp)
- MON *mp;
+can_only_buy_hotel(MON *mp)
{
int i;
diff --git a/games/monop/initdeck.c b/games/monop/initdeck.c
index a5bdd2b7a22..204108db46e 100644
--- a/games/monop/initdeck.c
+++ b/games/monop/initdeck.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: initdeck.c,v 1.16 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: initdeck.c,v 1.17 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: initdeck.c,v 1.3 1995/03/23 08:34:43 cgd Exp $ */
/*
@@ -65,9 +65,7 @@ static void count(void);
static void putem(void);
int
-main(ac, av)
- int ac;
- char *av[];
+main(int ac, char *av[])
{
int n;
@@ -138,9 +136,7 @@ main(ac, av)
}
static void
-getargs(ac, av)
- int ac;
- char *av[];
+getargs(int ac, char *av[])
{
if (ac > 1)
infile = av[1];
@@ -152,7 +148,7 @@ getargs(ac, av)
* count the cards
*/
static void
-count()
+count(void)
{
bool newline;
DECK *in_deck;
@@ -175,7 +171,7 @@ count()
* put strings in the file
*/
static void
-putem()
+putem(void)
{
bool newline;
DECK *in_deck;
diff --git a/games/monop/jail.c b/games/monop/jail.c
index 91dbadafe42..86b71d1217c 100644
--- a/games/monop/jail.c
+++ b/games/monop/jail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jail.c,v 1.6 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: jail.c,v 1.7 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: jail.c,v 1.3 1995/03/23 08:34:44 cgd Exp $ */
/*
@@ -39,7 +39,7 @@
* player out of jail.
*/
void
-card()
+card(void)
{
if (cur_p->loc != JAIL) {
printf("But you're not IN Jail\n");
@@ -57,7 +57,7 @@ card()
* This routine deals with paying your way out of jail.
*/
void
-pay()
+pay(void)
{
if (cur_p->loc != JAIL) {
printf("But you're not IN Jail\n");
@@ -72,8 +72,7 @@ pay()
* This routine deals with a move in jail
*/
int
-move_jail(r1, r2)
- int r1, r2;
+move_jail(int r1, int r2)
{
if (r1 != r2) {
printf("Sorry, that doesn't get you out\n");
@@ -95,7 +94,7 @@ moveit:
}
void
-printturn()
+printturn(void)
{
if (cur_p->loc != JAIL)
return;
diff --git a/games/monop/misc.c b/games/monop/misc.c
index 170ee4f243d..9661a4e590a 100644
--- a/games/monop/misc.c
+++ b/games/monop/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.13 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: misc.c,v 1.14 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: misc.c,v 1.4 1995/03/23 08:34:47 cgd Exp $ */
/*
@@ -41,8 +41,7 @@
* "yes or "no" answer is gotten.
*/
int
-getyn(prompt)
- char *prompt;
+getyn(char *prompt)
{
int com;
@@ -56,7 +55,7 @@ getyn(prompt)
* This routine tells the player if he's out of money.
*/
void
-notify()
+notify(void)
{
if (cur_p->money < 0)
printf("That leaves you $%d in debt\n", -cur_p->money);
@@ -71,7 +70,7 @@ notify()
* This routine switches to the next player
*/
void
-next_play()
+next_play(void)
{
player = (player + 1) % num_play;
cur_p = &play[player];
@@ -82,8 +81,7 @@ next_play()
* given prompt.
*/
int
-get_int(prompt)
- char *prompt;
+get_int(char *prompt)
{
int num, snum;
char *sp;
@@ -131,8 +129,7 @@ get_int(prompt)
* This routine sets the monopoly flag from the list given.
*/
void
-set_ownlist(pl)
- int pl;
+set_ownlist(int pl)
{
int num; /* general counter */
MON *orig; /* remember starting monop ptr */
@@ -237,9 +234,7 @@ set_ownlist(pl)
* This routine sets things up as if it is a new monopoly
*/
void
-is_monop(mp, pl)
- MON *mp;
- int pl;
+is_monop(MON *mp, int pl)
{
int i;
@@ -253,8 +248,7 @@ is_monop(mp, pl)
* This routine sets things up as if it is no longer a monopoly
*/
void
-isnot_monop(mp)
- MON *mp;
+isnot_monop(MON *mp)
{
int i;
@@ -267,7 +261,7 @@ isnot_monop(mp)
* This routine gives a list of the current player's routine
*/
void
-list()
+list(void)
{
printhold(player);
}
@@ -275,7 +269,7 @@ list()
* This routine gives a list of a given players holdings
*/
void
-list_all()
+list_all(void)
{
int pl;
@@ -286,7 +280,7 @@ list_all()
* This routine gives the players a chance before it exits.
*/
void
-quit()
+quit(void)
{
putchar('\n');
if (getyn("Do you all really want to quit? ") == 0)
diff --git a/games/monop/monop.c b/games/monop/monop.c
index f29ce6a22fb..beae73758c3 100644
--- a/games/monop/monop.c
+++ b/games/monop/monop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monop.c,v 1.15 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: monop.c,v 1.16 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: monop.c,v 1.3 1995/03/23 08:34:52 cgd Exp $ */
/*
@@ -46,9 +46,7 @@ static void init_monops(void);
* This program implements a monopoly game
*/
int
-main(ac, av)
- int ac;
- char *av[];
+main(int ac, char *av[])
{
num_luck = sizeof lucky_mes / sizeof (char *);
@@ -78,7 +76,7 @@ main(ac, av)
* This routine gets the names of the players
*/
static void
-getplayers()
+getplayers(void)
{
int i, j;
char buf[257];
@@ -127,7 +125,7 @@ blew_it:
* This routine figures out who goes first
*/
static void
-init_players()
+init_players(void)
{
int i, rl, cur_max;
bool over = 0;
@@ -158,7 +156,7 @@ again:
* This routine initializes the monopoly structures.
*/
static void
-init_monops()
+init_monops(void)
{
MON *mp;
int i;
diff --git a/games/monop/morg.c b/games/monop/morg.c
index c4e0ba511e3..68f77d1afd1 100644
--- a/games/monop/morg.c
+++ b/games/monop/morg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: morg.c,v 1.7 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: morg.c,v 1.8 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: morg.c,v 1.4 1995/03/23 08:35:02 cgd Exp $ */
/*
@@ -73,7 +73,7 @@ static void unm(int);
* be mortgaged.
*/
void
-mortgage()
+mortgage(void)
{
int prop;
@@ -102,7 +102,7 @@ mortgage()
* This routine sets up the list of mortgageable property
*/
static int
-set_mlist()
+set_mlist(void)
{
OWN *op;
@@ -124,8 +124,7 @@ set_mlist()
* This routine actually mortgages the property.
*/
static void
-m(prop)
- int prop;
+m(int prop)
{
int price;
@@ -140,7 +139,7 @@ m(prop)
* to be unmortgaged.
*/
void
-unmortgage()
+unmortgage(void)
{
int prop;
@@ -165,7 +164,7 @@ unmortgage()
* This routine sets up the list of mortgaged property
*/
static int
-set_umlist()
+set_umlist(void)
{
OWN *op;
@@ -183,8 +182,7 @@ set_umlist()
* This routine actually unmortgages the property
*/
static void
-unm(prop)
- int prop;
+unm(int prop)
{
int price;
@@ -200,7 +198,7 @@ unm(prop)
* 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) {
diff --git a/games/monop/print.c b/games/monop/print.c
index c19d1b9c03f..ca22a935085 100644
--- a/games/monop/print.c
+++ b/games/monop/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.7 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: print.c,v 1.8 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $ */
/*
@@ -42,7 +42,7 @@ static void printmorg(SQUARE *);
* This routine prints out the current board
*/
void
-printboard()
+printboard(void)
{
int i;
@@ -57,7 +57,7 @@ printboard()
* This routine lists where each player is.
*/
void
-where()
+where(void)
{
int i;
@@ -74,9 +74,7 @@ where()
* This routine prints out an individual square
*/
void
-printsq(sqn, eoln)
- int sqn;
- bool eoln;
+printsq(int sqn, bool eoln)
{
int rnt;
PROP *pp;
@@ -156,8 +154,7 @@ printsq(sqn, eoln)
* This routine prints out the mortgage flag.
*/
static void
-printmorg(sqp)
- SQUARE *sqp;
+printmorg(SQUARE *sqp)
{
if (sqp->desc->morg)
printf(" * ");
@@ -168,8 +165,7 @@ printmorg(sqp)
* This routine lists the holdings of the player given
*/
void
-printhold(pl)
- int pl;
+printhold(int pl)
{
OWN *op;
PLAY *pp;
diff --git a/games/monop/prop.c b/games/monop/prop.c
index ed79fe50304..925051e90f1 100644
--- a/games/monop/prop.c
+++ b/games/monop/prop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prop.c,v 1.10 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: prop.c,v 1.11 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: prop.c,v 1.3 1995/03/23 08:35:06 cgd Exp $ */
/*
@@ -43,9 +43,7 @@ static int value(SQUARE *);
* appropriate flags.
*/
void
-buy(plr, sqrp)
- int plr;
- SQUARE *sqrp;
+buy(int plr, SQUARE *sqrp)
{
trading = FALSE;
sqrp->owner = plr;
@@ -55,10 +53,7 @@ buy(plr, sqrp)
* This routine adds an item to the list.
*/
void
-add_list(plr, head, op_sqr)
- int plr;
- OWN **head;
- int op_sqr;
+add_list(int plr, OWN **head, int op_sqr)
{
int val;
OWN *tp, *last_tp;
@@ -88,10 +83,7 @@ add_list(plr, head, op_sqr)
* This routine deletes property from the list.
*/
void
-del_list(plr, head, op_sqr)
- int plr;
- OWN **head;
- shrt op_sqr;
+del_list(int plr, OWN **head, shrt op_sqr)
{
OWN *op, *last_op;
@@ -124,8 +116,7 @@ del_list(plr, head, op_sqr)
* given square.
*/
static int
-value(sqp)
- SQUARE *sqp;
+value(SQUARE *sqp)
{
int sqr;
@@ -150,7 +141,7 @@ value(sqp)
* This routine accepts bids for the current piece of property.
*/
void
-bid()
+bid(void)
{
static bool in[MAX_PL];
int i, num_in, cur_max;
@@ -200,8 +191,7 @@ bid()
* of given player.
*/
int
-prop_worth(plp)
- PLAY *plp;
+prop_worth(PLAY *plp)
{
OWN *op;
int worth;
diff --git a/games/monop/rent.c b/games/monop/rent.c
index 31454d4a4f9..41ab08b8017 100644
--- a/games/monop/rent.c
+++ b/games/monop/rent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rent.c,v 1.6 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: rent.c,v 1.7 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: rent.c,v 1.3 1995/03/23 08:35:11 cgd Exp $ */
/*
@@ -38,8 +38,7 @@
* This routine has the player pay rent
*/
void
-rent(sqp)
- SQUARE *sqp;
+rent(SQUARE *sqp)
{
int rnt;
PROP *pp;
diff --git a/games/monop/roll.c b/games/monop/roll.c
index 501e177a204..1524584e4ab 100644
--- a/games/monop/roll.c
+++ b/games/monop/roll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roll.c,v 1.6 2013/08/29 20:22:16 naddy Exp $ */
+/* $OpenBSD: roll.c,v 1.7 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: roll.c,v 1.5 1995/03/23 08:35:13 cgd Exp $ */
/*
@@ -36,8 +36,7 @@
* This routine rolls ndie nside-sided dice.
*/
int
-roll(ndie, nsides)
- int ndie, nsides;
+roll(int ndie, int nsides)
{
int tot;
diff --git a/games/monop/spec.c b/games/monop/spec.c
index 9e493c2ab3a..385c8de2c9d 100644
--- a/games/monop/spec.c
+++ b/games/monop/spec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec.c,v 1.6 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: spec.c,v 1.7 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: spec.c,v 1.3 1995/03/23 08:35:16 cgd Exp $ */
/*
@@ -39,7 +39,7 @@ static char *perc[] = {
};
void
-inc_tax() /* collect income tax */
+inc_tax(void) /* collect income tax */
{
int worth, com_num;
@@ -67,26 +67,26 @@ inc_tax() /* collect income tax */
}
void
-goto_jail() /* move player to jail */
+goto_jail(void) /* move player to jail */
{
cur_p->loc = JAIL;
}
void
-lux_tax() /* landing on luxury tax */
+lux_tax(void) /* landing on luxury tax */
{
printf("You lose $75\n");
cur_p->money -= 75;
}
void
-cc() /* draw community chest card */
+cc(void) /* draw community chest card */
{
get_card(&CC_D);
}
void
-chance() /* draw chance card */
+chance(void) /* draw chance card */
{
get_card(&CH_D);
}
diff --git a/games/monop/trade.c b/games/monop/trade.c
index 6abdef632a3..c4f61fa85c0 100644
--- a/games/monop/trade.c
+++ b/games/monop/trade.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trade.c,v 1.7 2016/01/08 18:19:47 mestre Exp $ */
+/* $OpenBSD: trade.c,v 1.8 2016/01/08 18:20:33 mestre Exp $ */
/* $NetBSD: trade.c,v 1.3 1995/03/23 08:35:19 cgd Exp $ */
/*
@@ -57,7 +57,7 @@ static void do_trade(void);
static void move_em(TRADE *, TRADE *);
void
-trade()
+trade(void)
{
int tradee, i;
@@ -96,8 +96,7 @@ over:
* player, and puts in the structure given.
*/
static void
-get_list(struct_no, play_no)
- int struct_no, play_no;
+get_list(int struct_no, int play_no)
{
int sn, pn;
PLAY *pp;
@@ -148,8 +147,7 @@ once_more:
* This routine sets up the list of tradable property.
*/
static int
-set_list(the_list)
- OWN *the_list;
+set_list(OWN *the_list)
{
int i;
OWN *op;
@@ -166,7 +164,7 @@ set_list(the_list)
* This routine summates the trade.
*/
static void
-summate()
+summate(void)
{
bool some;
int i;
@@ -196,7 +194,7 @@ summate()
* This routine actually executes the trade.
*/
static void
-do_trade()
+do_trade(void)
{
move_em(&trades[0], &trades[1]);
move_em(&trades[1], &trades[0]);
@@ -205,8 +203,7 @@ do_trade()
* This routine does a switch from one player to another
*/
static void
-move_em(from, to)
- TRADE *from, *to;
+move_em(TRADE *from, TRADE *to)
{
PLAY *pl_fr, *pl_to;
OWN *op;
@@ -229,7 +226,7 @@ move_em(from, to)
* This routine lets a player resign
*/
void
-resign()
+resign(void)
{
int i, new_own;
OWN *op;