don't try to switch a char and have a case of EOF - use an int.

[bsdgames-darwin.git] / rogue / main.c

diff --git a/rogue/main.c b/rogue/main.c
index febec33083ca4dcccb1153e52e155caa42e0b006..3bd75fe669f5efc7f195ceacf27be0030f9d91e0 100644 (file)
--- a/rogue/main.c
+++ b/rogue/main.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: main.c,v 1.6 2004/01/27 20:30:30 jsm Exp $     */
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -13,11 +15,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.
  *
@@ -34,15 +32,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)main.c     5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:52:25 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: main.c,v 1.6 2004/01/27 20:30:30 jsm Exp $");
+#endif
 #endif /* not lint */
 
 /*
@@ -59,11 +60,12 @@ static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:52:25 mycroft Exp $";
 
 #include "rogue.h"
 
-extern short party_room;
+int    main(int, char **);
 
+int
 main(argc, argv)
-int argc;
-char *argv[];
+       int argc;
+       char *argv[];
 {
        if (init(argc, argv)) {         /* restored game */
                goto PL;