From 091a2961abba52de34ae80528ac14a6dc72ee7b9 Mon Sep 17 00:00:00 2001 From: pogokeen Date: Wed, 7 Aug 2019 20:28:28 +0000 Subject: [PATCH] game.cpp: move check for quitevent during start-up so that if start-up is cancelled during definitions parsing, the game won't continue to play in a half-loaded state. git-svn-id: https://svn.eduke32.com/eduke32@7900 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 8b286fbe5..463d8ede7 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -6457,8 +6457,6 @@ int app_main(int argc, char const * const * argv) i = 1-i; } - if (quitevent) return 4; - Anim_Init(); const char *defsfile = G_DefFile(); @@ -6567,6 +6565,8 @@ int app_main(int argc, char const * const * argv) system_getcvars(); + if (quitevent) return 4; + if (g_networkMode != NET_DEDICATED_SERVER) { if (videoSetGameMode(ud.setup.fullscreen, ud.setup.xdim, ud.setup.ydim, ud.setup.bpp, ud.detail) < 0)