- avoid multipling a boolean value, use &&.

[bsdgames-darwin.git] / battlestar / room.c

diff --git a/battlestar/room.c b/battlestar/room.c
index 8dd8bec359ffbc6e49d0cf095bf61df1168aecd5..61defbbbdbf889c3a854f5b75bfd81189fe99a26 100644 (file)
--- a/battlestar/room.c
+++ b/battlestar/room.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: room.c,v 1.9 2000/09/10 10:52:56 jsm Exp $     */
+/*     $NetBSD: room.c,v 1.13 2011/05/23 22:44:18 joerg Exp $  */
 
 /*
  * Copyright (c) 1983, 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,21 +34,21 @@
 #if 0
 static char sccsid[] = "@(#)room.c     8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: room.c,v 1.9 2000/09/10 10:52:56 jsm Exp $");
+__RCSID("$NetBSD: room.c,v 1.13 2011/05/23 22:44:18 joerg Exp $");
 #endif
 #endif                         /* not lint */
 
 #include "extern.h"
 
 void
-writedes()
+writedes(void)
 {
        int     compass;
        const char   *p;
        int     c;
 
        printf("\n\t%s\n", location[position].name);
-       if (beenthere[position] < ROOMDESC) {
+       if (beenthere[position] < ROOMDESC || verbose) {
                compass = NORTH;
                for (p = location[position].desc; (c = *p++) != 0;)
                        if (c != '-' && c != '*' && c != '+') {
@@ -62,14 +58,14 @@ writedes()
                                        putchar(c);
                        } else {
                                if (c != '*')
-                                       printf(truedirec(compass, c));
+                                       printf("%s", truedirec(compass, c));
                                compass++;
                        }
        }
 }
 
 void
-printobjs()
+printobjs(void)
 {
        unsigned int *p = location[position].objects;
        int     n;
@@ -81,8 +77,7 @@ printobjs()
 }
 
 void
-whichway(here)
-       struct room here;
+whichway(struct room here)
 {
        switch (direction) {
 
@@ -117,10 +112,8 @@ whichway(here)
        }
 }
 
-const char   *
-truedirec(way, option)
-       int     way;
-       char    option;
+const char *
+truedirec(int way, int option)
 {
        switch (way) {
 
@@ -177,14 +170,14 @@ truedirec(way, option)
                }
 
        default:
-               printf("Error: room %d.  More than four directions wanted.", position);
+               printf("Error: room %d.  More than four directions wanted.", 
+                   position);
                return ("!!");
        }
 }
 
 void
-newway(thisway)
-       int     thisway;
+newway(int thisway)
 {
        switch (direction) {