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

[bsdgames-darwin.git] / monop / monop.h

diff --git a/monop/monop.h b/monop/monop.h
index 23896e76f68a96b0c7ad21dfeec7730c6dee4430..ecc74204d2e02ef5a340612438d9fe7cadbd755f 100644 (file)
--- a/monop/monop.h
+++ b/monop/monop.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: monop.h,v 1.10 1999/09/30 18:01:32 jsm Exp $   */
+/*     $NetBSD: monop.h,v 1.19 2009/08/12 08:10:49 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.
  *
@@ -52,6 +48,8 @@
 #define        N_SQRS  40      /* number of squares on board           */
 #define        MAX_PL  9       /* maximum number of players            */
 #define        MAX_PRP (N_PROP+N_RR+N_UTIL) /* max # ownable property  */
+#define        N_HOUSE 32      /* total number of houses available     */
+#define        N_HOTEL 12      /* total number of hotels available     */
 
                                /* square type numbers                  */
 #define        PRPTY   0       /* normal property                      */
@@ -69,12 +67,7 @@
 
 #define        lucky(str)      printf("%s%s\n",str,lucky_mes[roll(1,num_luck)-1])
 #define        printline()     printf("------------------------------\n")
-#define        sqnum(sqp)      (sqp - board)
-#define        swap(A1,A2)     if ((A1) != (A2)) { \
-                                       (A1) ^= (A2); \
-                                       (A2) ^= (A1); \
-                                       (A1) ^= (A2); \
-                               }
+#define        sqnum(sqp)      ((short)(sqp - board))
 
 struct sqr_st {                        /* structure for square                 */
        const char      *name;          /* place name                   */
@@ -128,7 +121,7 @@ struct plr_st {                     /* player description structure         */
        short   loc;                    /* location on board            */
        short   in_jail;                /* count of turns in jail       */
        int     money;                  /* amount of money              */
-       OWN     *own_list;              /* start of propery list        */
+       OWN     *own_list;              /* start of property list       */
 };
 
 typedef struct plr_st  PLAY;
@@ -136,76 +129,93 @@ typedef struct prp_st     PROP;
 typedef struct prp_st  RR_S;
 typedef struct prp_st  UTIL_S;
 
+extern bool    trading, spec, fixing, told_em;
+
+extern const char      *const yncoms[], *name_list[], *const lucky_mes[];
+
+extern int     num_play, player, num_doub, num_luck;
+
+extern void (*const func[])(void);
+
+/*extern MON   mon[N_MON];*/
+
+extern PLAY    *play, *cur_p;
+
+extern PROP    prop[N_PROP];
+
+/*extern RR_S  rr[N_RR];*/
+
+extern SQUARE  board[N_SQRS + 1];
+
+/*extern UTIL_S        util[2];*/
+
 
 /* cards.c */
-void init_decks __P((void));
-void get_card __P((DECK *));
+void ret_card(PLAY *);
 
 /* execute.c */
-void execute __P((int));
-void do_move __P((void));
-void move __P((int));
-void save __P((void));
-void restore __P((void));
-int rest_f __P((const char *));
+void execute(int);
+void do_move(void);
+void move(int);
+void save(void);
+void restore(void);
+int rest_f(const char *);
 
 /* getinp.c */
-int getinp __P((const char *, const char *const []));
+int getinp(const char *, const char *const []);
 
 /* houses.c */
-void buy_houses __P((void));
-void sell_houses __P((void));
+void buy_houses(void);
+void sell_houses(void);
 
 /* jail.c */
-void card __P((void));
-void ret_card __P((PLAY *));
-void pay __P((void));
-int move_jail __P((int, int ));
-void printturn __P((void));
+void card(void);
+void pay(void);
+int move_jail(int, int );
+void printturn(void);
 
 /* misc.c */
-int getyn __P((const char *));
-void notify __P((void));
-void next_play __P((void));
-int get_int __P((const char *));
-void set_ownlist __P((int));
-void is_monop __P((MON *, int));
-void is_not_monop __P((MON *));
-void list __P((void));
-void list_all __P((void));
-void quit __P((void));
+int getyn(const char *);
+void notify(void);
+void next_play(void);
+int get_int(const char *);
+void set_ownlist(int);
+void is_not_monop(MON *);
+void list(void);
+void list_all(void);
+void quit(void);
 
 /* morg.c */
-void mortgage __P((void));
-void unmortgage __P((void));
-void force_morg __P((void));
+void mortgage(void);
+void unmortgage(void);
+void force_morg(void);
 
 /* print.c */
-void printboard __P((void));
-void where __P((void));
-void printsq __P((int, bool));
-void printhold __P((int));
+void printboard(void);
+void where(void);
+void printsq(int, bool);
+void printhold(int);
 
 /* prop.c */
-void buy __P((int, SQUARE *));
-void add_list __P((int, OWN **, int));
-void del_list __P((int, OWN **, short));
-void bid __P((void));
-int prop_worth __P((PLAY *));
+void buy(int, SQUARE *);
+void add_list(int, OWN **, int);
+void del_list(int, OWN **, short);
+void bid(void);
+int prop_worth(PLAY *);
 
 /* rent.c */
-void rent __P((SQUARE *));
+void rent(SQUARE *);
 
 /* roll.c */
-int roll __P((int, int));
+int roll(int, int);
 
 /* spec.c */
-void inc_tax __P((void));
-void goto_jail __P((void));
-void lux_tax __P((void));
-void cc __P((void));
-void chance __P((void));
+void inc_tax(void);
+void goto_jail(void);
+void lux_tax(void);
+void cc(void);
+void chance(void);
 
 /* trade.c */
-void trade __P((void));
-void resign __P((void));
+void trade(void);
+void resign(void);