From 75205ca69cf378edbb0489367c7dfe72cdef5f44 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 20 Oct 2019 11:28:16 +0200 Subject: [PATCH] - do not throw exceptions to exit without proper handling. --- source/build/include/compat.h | 2 +- source/duke3d/src/game.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/source/build/include/compat.h b/source/build/include/compat.h index dd00529c1..0fe63f17e 100644 --- a/source/build/include/compat.h +++ b/source/build/include/compat.h @@ -655,7 +655,7 @@ static FORCE_INLINE int32_t Blrintf(const float x) #ifdef DEBUGGINGAIDS # define Bexit(status) do { initprintf("exit(%d) at %s:%d in %s()\n", status, __FILE__, __LINE__, EDUKE32_FUNCTION); exit(status); } while (0) #else -# define Bexit(a) throw(1) +# define Bexit(a) exit(a)// throw(1) #endif diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 4a2970730..df1bcc4ee 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -286,10 +286,6 @@ int32_t A_CheckInventorySprite(spritetype *s) void G_GameExit(const char *msg) { -#ifdef LUNATIC - El_PrintTimes(); - El_DestroyState(&g_ElState); -#endif if (*msg != 0 && g_player[myconnectindex].ps != NULL) g_player[myconnectindex].ps->palette = BASEPAL;