diff --git a/common/main/inferno.h b/common/main/inferno.h index fa1b06185..15a929315 100644 --- a/common/main/inferno.h +++ b/common/main/inferno.h @@ -20,8 +20,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _INFERNO_H #define _INFERNO_H -#include - struct d_event; #if defined(__APPLE__) || defined(macintosh) @@ -48,7 +46,6 @@ typedef char d_fname[FILENAME_LEN]; ** Global variables **/ -extern jmp_buf LeaveEvents; extern int Quitting; extern int Screen_mode; // editor screen or game screen? #ifdef DXX_BUILD_DESCENT_I diff --git a/similar/main/game.cpp b/similar/main/game.cpp index 379fe3240..ff09cb869 100644 --- a/similar/main/game.cpp +++ b/similar/main/game.cpp @@ -22,7 +22,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include -#include #ifdef OGL #include "ogl_init.h" @@ -1140,7 +1139,6 @@ int game_handler(window *wind, d_event *event, unused_window_userdata_t *) break; case EVENT_WINDOW_CLOSED: - longjmp(LeaveEvents, 0); break; default: diff --git a/similar/main/inferno.cpp b/similar/main/inferno.cpp index b33531467..885fb52ad 100644 --- a/similar/main/inferno.cpp +++ b/similar/main/inferno.cpp @@ -307,7 +307,6 @@ int standard_handler(d_event *event) return 0; } -jmp_buf LeaveEvents; #define PROGNAME argv[0] // DESCENT by Parallax Software @@ -522,7 +521,6 @@ int main(int argc, char *argv[]) DoMenu(); } - setjmp(LeaveEvents); while (window_get_front()) // Send events to windows and the default handler event_process();