Removing trailing spaces.

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

diff --git a/battlestar/battlestar.c b/battlestar/battlestar.c
index e3c0d4cc58f03a1a9c27adea10cb3e7fd081b501..f26e88140b0268853255ba65781a997852b230a6 100644 (file)
--- a/battlestar/battlestar.c
+++ b/battlestar/battlestar.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: battlestar.c,v 1.10 2000/05/08 07:56:01 mycroft Exp $  */
+/*     $NetBSD: battlestar.c,v 1.15 2005/07/01 06:04:54 jmc 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.
  *
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)battlestar.c       8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: battlestar.c,v 1.10 2000/05/08 07:56:01 mycroft Exp $");
+__RCSID("$NetBSD: battlestar.c,v 1.15 2005/07/01 06:04:54 jmc Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -56,12 +52,8 @@ __RCSID("$NetBSD: battlestar.c,v 1.10 2000/05/08 07:56:01 mycroft Exp $");
 
 #include "extern.h"
 
-int main __P((int, char *[]));
-
 int
-main(argc, argv)
-       int     argc;
-       char  **argv;
+main(int argc, char **argv)
 {
        char    mainbuf[LINELENGTH];
        char   *next;
@@ -70,12 +62,16 @@ main(argc, argv)
        open_score_file();
        setgid(getgid());
 
-       initialize((argc < 2) ? NULL : (strcmp(argv[1], "-r") ? argv[1]
-                                       : (argv[2] ? argv[2]
-                                          : DEFAULT_SAVE_FILE)));
+       if (argc < 2)
+               initialize(NULL);
+       else if (strcmp(argv[1], "-r") == 0)
+               initialize((argc > 2) ? argv[2] : DEFAULT_SAVE_FILE);
+       else
+               initialize(argv[1]);
 start:
        news();
-       beenthere[position]++;
+       if (beenthere[position] <= ROOMDESC)
+               beenthere[position]++;
        if (notes[LAUNCHED])
                crash();        /* decrements fuel & crash */
        if (matchlight) {
@@ -92,7 +88,7 @@ start:
 run:
        next = getcom(mainbuf, sizeof mainbuf, ">-: ",
            "Please type in something.");
-       for (wordcount = 0; next && wordcount < 20; wordcount++)
+       for (wordcount = 0; next && wordcount < NWORD - 1; wordcount++)
                next = getword(next, words[wordcount], -1);
        parse();
        switch (cypher()) {