Add Warp Kit, Version 7.0 by Larry Wall

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

diff --git a/phantasia/main.c b/phantasia/main.c
index 7e480d0a50d54bcd059afafd5218386edbe3b20f..c8850da86a4eaf591a9bed9c4991efab21d353a8 100644 (file)
--- a/phantasia/main.c
+++ b/phantasia/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.22 2009/08/12 08:21:41 dholland Exp $       */
+/*     $NetBSD: main.c,v 1.24 2019/02/03 03:19:25 mrg Exp $    */
 
 /*
  * Phantasia 3.3.2 -- Interterminal fantasy game
@@ -27,10 +27,25 @@
  * AT&T is in no way connected with this game.
  */
 
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <err.h>
+#include <math.h>
 #include <pwd.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "macros.h"
+#include "phantdefs.h"
+#include "phantstruct.h"
+#include "phantglobs.h"
+#include "pathnames.h"
+
+#undef bool
+#include <curses.h>
 
 /*
  * The program allocates as much file space as it needs to store characters,
@@ -57,10 +72,6 @@
  * main.c      Main routines for Phantasia
  */
 
-#include "include.h"
-#undef bool
-#include <curses.h>
-
 static void genchar(int);
 static void initialstate(void);
 static void neatstuff(void);
@@ -97,11 +108,13 @@ main(int argc, char **argv)
                case 'a':       /* all users */
                        activelist();
                        cleanup(TRUE);
+                       __unreachable();
                        /* NOTREACHED */
 
                case 'p':       /* purge old players */
                        purgeoldplayers();
                        cleanup(TRUE);
+                       __unreachable();
                        /* NOTREACHED */
 
                case 'S':       /* set 'Wizard' */
@@ -115,11 +128,13 @@ main(int argc, char **argv)
                case 'm':       /* monsters */
                        monstlist();
                        cleanup(TRUE);
+                       __unreachable();
                        /* NOTREACHED */
 
                case 'b':       /* scoreboard */
                        scorelist();
                        cleanup(TRUE);
+                       __unreachable();
                        /* NOTREACHED */
                }
 
@@ -132,15 +147,18 @@ main(int argc, char **argv)
        if (examine) {
                changestats(FALSE);
                cleanup(TRUE);
+               __unreachable();
                /* NOTREACHED */
        }
        if (!noheader) {
                titlelist();
                purgeoldplayers();      /* clean up old characters */
        }
-       if (headeronly)
+       if (headeronly) {
                cleanup(TRUE);
-       /* NOTREACHED */
+               __unreachable();
+               /* NOTREACHED */
+       }
 
        do
                /* get the player structure filled */
@@ -156,6 +174,7 @@ main(int argc, char **argv)
 
                case 'Q':
                        cleanup(TRUE);
+                       __unreachable();
                        /* NOTREACHED */
 
                default:
@@ -533,6 +552,7 @@ procmain(void)
 
        case '5':               /* good-bye */
                leavegame();
+               __unreachable();
                /* NOTREACHED */
 
        case '6':               /* cloak */