]> git.cameronkatri.com Git - bsdgames-darwin.git/blobdiff - monop/misc.c
Fix grammar (bug reported by Thomas Bushnell BSG <tb@MIT.EDU> in
[bsdgames-darwin.git] / monop / misc.c
index 00d301e28cc2a94d175e52d5d09c9f71f99b7171..f9a375573948616f2f4b8da279ef6d8ef48dda61 100644 (file)
@@ -1,4 +1,4 @@
-/*     $NetBSD: misc.c,v 1.5 1997/03/29 20:42:24 thorpej Exp $ */
+/*     $NetBSD: misc.c,v 1.12 2004/01/26 09:59:36 jsm Exp $    */
 
 /*
  * Copyright (c) 1980, 1993
  * 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.
  *
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)misc.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: misc.c,v 1.5 1997/03/29 20:42:24 thorpej Exp $";
+__RCSID("$NetBSD: misc.c,v 1.12 2004/01/26 09:59:36 jsm Exp $");
 #endif
 #endif /* not lint */
 
-# include      "monop.ext"
-# include      <ctype.h>
-# include      <signal.h>
+#include "monop.ext"
+#include <ctype.h>
+#include <signal.h>
 
 /*
  *     This routine executes a truncated set of commands until a
  * "yes or "no" answer is gotten.
  */
+int
 getyn(prompt)
-reg char       *prompt; {
-
-       reg int com;
+       const char *prompt;
+{
+       int com;
 
        for (;;)
-               if ((com=getinp(prompt, yn)) < 2)
+               if ((com=getinp(prompt, yncoms)) < 2)
                        return com;
                else
                        (*func[com-2])();
 }
+
 /*
  *     This routine tells the player if he's out of money.
  */
-notify() {
-
+void
+notify()
+{
        if (cur_p->money < 0)
                printf("That leaves you $%d in debt\n", -cur_p->money);
        else if (cur_p->money == 0)
@@ -74,26 +74,30 @@ notify() {
                told_em = TRUE;
        }
 }
+
 /*
  *     This routine switches to the next player
  */
-next_play() {
-
-       player = ++player % num_play;
+void
+next_play()
+{
+       player = (player + 1) % num_play;
        cur_p = &play[player];
        num_doub = 0;
 }
+
 /*
  *     This routine gets an integer from the keyboard after the
  * given prompt.
  */
+int
 get_int(prompt)
-reg char       *prompt; {
-
-       reg int         num;
-       reg char        *sp;
-       int             c;
-       char            buf[257];
+       const char *prompt;
+{
+       int num;
+       char *sp;
+       int c;
+       char buf[257];
 
        for (;;) {
 inter:
@@ -115,16 +119,18 @@ inter:
                        printf("I can't understand that\n");
        }
 }
+
 /*
  *     This routine sets the monopoly flag from the list given.
  */
+void
 set_ownlist(pl)
-int    pl; {
-
-       reg int num;            /* general counter              */
-       reg MON *orig;          /* remember starting monop ptr  */
-       reg OWN *op;            /* current owned prop           */
-       OWN     *orig_op;               /* origianl prop before loop    */
+       int pl;
+{
+       int num;                /* general counter              */
+       MON *orig;              /* remember starting monop ptr  */
+       OWN *op;                /* current owned prop           */
+       OWN *orig_op;           /* origianl prop before loop    */
 
        op = play[pl].own_list;
 #ifdef DEBUG
@@ -139,7 +145,8 @@ int pl; {
 #ifdef DEBUG
                        printf("  case UTIL:\n");
 #endif
-                       for (num = 0; op && op->sqr->type == UTIL; op = op->next)
+                       for (num = 0; op && op->sqr->type == UTIL;
+                           op = op->next)
                                num++;
                        play[pl].num_util = num;
 #ifdef DEBUG
@@ -150,10 +157,13 @@ int       pl; {
 #ifdef DEBUG
                        printf("  case RR:\n");
 #endif
-                       for (num = 0; op && op->sqr->type == RR; op = op->next) {
+                       for (num = 0; op && op->sqr->type == RR;
+                           op = op->next) {
 #ifdef DEBUG
                                printf("iter: %d\n", num);
-                               printf("op = %d, op->sqr = %d, op->sqr->type = %d\n", op, op->sqr, op->sqr->type);
+                               printf("op = %d, op->sqr = %d, "
+                                   "op->sqr->type = %d\n", op, op->sqr,
+                                   op->sqr->type);
 #endif
                                num++;
                        }
@@ -186,17 +196,21 @@ int       pl; {
                        printf("num = %d\n");
 #endif
                        if (orig == 0) {
-                               printf("panic:  bad monopoly descriptor: orig = %d\n", orig);
+                               printf("panic:  bad monopoly descriptor: "
+                                   "orig = %p\n", orig);
                                printf("player # %d\n", pl+1);
                                printhold(pl);
-                               printf("orig_op = %d\n", orig_op);
-                               printf("orig_op->sqr->type = %d (PRPTY)\n", op->sqr->type);
-                               printf("orig_op->next = %d\n", op->next);
-                               printf("orig_op->sqr->desc = %d\n", op->sqr->desc);
-                               printf("op = %d\n", op);
-                               printf("op->sqr->type = %d (PRPTY)\n", op->sqr->type);
-                               printf("op->next = %d\n", op->next);
-                               printf("op->sqr->desc = %d\n", op->sqr->desc);
+                               printf("orig_op = %p\n", orig_op);
+                               printf("orig_op->sqr->type = %d (PRPTY)\n",
+                                   op->sqr->type);
+                               printf("orig_op->next = %p\n", op->next);
+                               printf("orig_op->sqr->desc = %p\n",
+                                   op->sqr->desc);
+                               printf("op = %p\n", op);
+                               printf("op->sqr->type = %d (PRPTY)\n",
+                                   op->sqr->type);
+                               printf("op->next = %p\n", op->next);
+                               printf("op->sqr->desc = %p\n", op->sqr->desc);
                                printf("num = %d\n", num);
                        }
 #ifdef DEBUG
@@ -205,20 +219,21 @@ int       pl; {
                        if (num == orig->num_in)
                                is_monop(orig, pl);
                        else
-                               isnot_monop(orig);
+                               is_not_monop(orig);
                        break;
                }
        }
 }
+
 /*
  *     This routine sets things up as if it is a new monopoly
  */
+void
 is_monop(mp, pl)
-reg MON        *mp;
-int    pl; {
-
-       reg char        *sp;
-       reg int         i;
+       MON *mp;
+       int pl;
+{
+       int i;
 
        mp->owner = pl;
        mp->num_own = mp->num_in;
@@ -226,55 +241,51 @@ int       pl; {
                mp->sq[i]->desc->monop = TRUE;
        mp->name = mp->mon_n;
 }
+
 /*
  *     This routine sets things up as if it is no longer a monopoly
  */
-isnot_monop(mp)
-reg MON        *mp; {
-
-       reg char        *sp;
-       reg int         i;
+void
+is_not_monop(mp)
+       MON *mp;
+{
+       int i;
 
        mp->owner = -1;
        for (i = 0; i < mp->num_in; i++)
                mp->sq[i]->desc->monop = FALSE;
        mp->name = mp->not_m;
 }
+
 /*
  *     This routine gives a list of the current player's routine
  */
-list() {
-
+void
+list()
+{
        printhold(player);
 }
+
 /*
  *     This routine gives a list of a given players holdings
  */
-list_all() {
-
-       reg int pl;
+void
+list_all()
+{
+       int pl;
 
-       while ((pl=getinp("Whose holdings do you want to see? ", name_list)) < num_play)
+       while ((pl = getinp("Whose holdings do you want to see? ", name_list))
+           < num_play)
                printhold(pl);
 }
+
 /*
  *     This routine gives the players a chance before it exits.
  */
 void
-quit() {
-
+quit()
+{
        putchar('\n');
-       if (getyn("Do you all really want to quit? ", yn) == 0)
+       if (getyn("Do you all really want to quit? ") == 0)
                exit(0);
-       signal(SIGINT, quit);
-}
-/*
- *     This routine copies one structure to another
- */
-cpy_st(s1, s2, size)
-reg int        *s1, *s2, size; {
-
-       size /= 2;
-       while (size--)
-               *s1++ = *s2++;
 }