From 57cdcda2532efb6dca82b8781e1319a7b4bfc570 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 18 Aug 2020 20:56:18 +0200
Subject: [PATCH] - initiate a proper game state reset when ending an episode.

Fixes #207.
---
 source/blood/src/blood.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index d28cdf0a3..333afaabc 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -643,7 +643,8 @@ void ProcessFrame(void)
                     M_SetMenu(NAME_CreditsMenu);
 					gGameOptions.uGameFlags &= ~3;
 					gQuitGame = 1;
-				};
+                    gRestartGame = true;
+                };
 				
                 if (gGameOptions.uGameFlags&8)
 				{
@@ -904,7 +905,8 @@ static void commonTicker(bool &playvideo)
             playvideo = !bQuickStart;
         }
         else playvideo = false;
-        gamestate = GS_STARTUP;
+        // Don't switch to startup if we're already outside the game.
+        if (gamestate == GS_LEVEL) gamestate = GS_STARTUP;
     }
 }