]> granicus.if.org Git - nethack/commitdiff
unintentional change removal
authornethack.allison <nethack.allison>
Sun, 30 Nov 2003 05:54:02 +0000 (05:54 +0000)
committernethack.allison <nethack.allison>
Sun, 30 Nov 2003 05:54:02 +0000 (05:54 +0000)
A recursive guard check was accidentally checked in with the
status field stuff. Remove it.

include/decl.h
src/files.c
src/pline.c

index dac11660e1a3bdc89fef4cd13dedb759047a6668..734e8ec025897c956f67b86c32d9598f86b37a1e 100644 (file)
@@ -152,10 +152,6 @@ E NEARDATA struct sinfo {
        int panicking;          /* `panic' is in progress */
 #if defined(VMS) || defined(WIN32)
        int exiting;            /* an exit handler is executing */
-#endif
-       int in_impossible;
-#ifdef PANICLOG
-       int in_paniclog;
 #endif
 } program_state;
 
index d2e3086dc43e74ace72f634e55073e0ac902beb5..1cca1ca06baf105cc7b77f3d23ef60283a2b79b7 100644 (file)
@@ -2275,16 +2275,12 @@ const char *reason;     /* explanation */
        FILE *lfile;
        char buf[BUFSZ];
 
-       if (!program_state.in_paniclog) {
-               program_state.in_paniclog = 1;
-               lfile = fopen_datafile(PANICLOG, "a", TROUBLEPREFIX);
-               if (lfile) {
-                   (void) fprintf(lfile, "%s %08ld: %s %s\n",
-                                  version_string(buf), yyyymmdd((time_t)0L),
-                                  type, reason);
-                   (void) fclose(lfile);
-               }
-               program_state.in_paniclog = 0;
+       lfile = fopen_datafile(PANICLOG, "a", TROUBLEPREFIX);
+       if (lfile) {
+           (void) fprintf(lfile, "%s %08ld: %s %s\n",
+                          version_string(buf), yyyymmdd((time_t)0L),
+                          type, reason);
+           (void) fclose(lfile);
        }
 #endif /* PANICLOG */
        return;
index 60218fe15a49f6af5d8cd0bc54f700e3f2a4e333..2febc95f058ddf3b7852e00b624786f0717179ed 100644 (file)
@@ -252,9 +252,6 @@ void
 impossible VA_DECL(const char *, s)
        VA_START(s);
        VA_INIT(s, const char *);
-       if (program_state.in_impossible)
-               panic("impossible called impossible");
-       program_state.in_impossible = 1;
        {
            char pbuf[BUFSZ];
            Vsprintf(pbuf,s,VA_ARGS);
@@ -262,7 +259,6 @@ impossible VA_DECL(const char *, s)
        }
        vpline(s,VA_ARGS);
        pline("Program in disorder - perhaps you'd better #quit.");
-       program_state.in_impossible = 0;
        VA_END();
 }