From 9c423ae6a35f7bcaf8103616ffc0ca8f76bf1e12 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 21 Jan 2020 23:36:54 +0100
Subject: [PATCH] - take down the level outside the LoadGame function in
 ShadowWarrior.

With the new savegame system it was done too late which could cause crashes.
---
 source/build/include/baselayer.h       |  1 +
 source/common/menu/savegamemanager.cpp |  9 ++++++---
 source/sw/src/game.h                   |  3 ++-
 source/sw/src/save.cpp                 | 23 ++++++++++++++---------
 source/sw/src/sprite.cpp               |  2 +-
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/source/build/include/baselayer.h b/source/build/include/baselayer.h
index 0eea5be5f..4ff3f9ce3 100644
--- a/source/build/include/baselayer.h
+++ b/source/build/include/baselayer.h
@@ -123,6 +123,7 @@ struct GameInterface
 	virtual void DrawMenuCaption(const DVector2& origin, const char* text) {}
 	virtual bool SaveGame(FSaveGameNode*) { return false; }
 	virtual bool LoadGame(FSaveGameNode*) { return false; }
+	virtual bool CleanupForLoad() { return true; }
 	virtual void DoPrintMessage(int prio, const char*) {}
 	void PrintMessage(int prio, const char*fmt, ...)
 	{
diff --git a/source/common/menu/savegamemanager.cpp b/source/common/menu/savegamemanager.cpp
index 6b196f3c6..cf0e72de8 100644
--- a/source/common/menu/savegamemanager.cpp
+++ b/source/common/menu/savegamemanager.cpp
@@ -58,11 +58,14 @@ FSavegameManager savegameManager;
 
 void FSavegameManager::LoadGame(FSaveGameNode* node)
 {
-	if (OpenSaveGameForRead(node->Filename))
+	if (gi->CleanupForLoad())
 	{
-		if (gi->LoadGame(node))
+		if (OpenSaveGameForRead(node->Filename))
 		{
-			// do something here?
+			if (gi->LoadGame(node))
+			{
+				// do something here?
+			}
 		}
 	}
 }
diff --git a/source/sw/src/game.h b/source/sw/src/game.h
index db19273f8..ba888da68 100644
--- a/source/sw/src/game.h
+++ b/source/sw/src/game.h
@@ -2444,7 +2444,8 @@ struct GameInterface : ::GameInterface
 	FSavegameInfo GetSaveSig() override;
 	void DrawMenuCaption(const DVector2& origin, const char* text) override;
 	void DrawCenteredTextScreen(const DVector2& origin, const char* text, int position, bool bg) override;
-	bool LoadGame(FSaveGameNode* sv) override;
+    bool CleanupForLoad() override;
+    bool LoadGame(FSaveGameNode* sv) override;
 	bool SaveGame(FSaveGameNode* sv) override;
 	void DoPrintMessage(int prio, const char* text) override;
     void SetAmbience(bool on) override { if (on) StartAmbientSound(); else StopAmbientSound(); }
diff --git a/source/sw/src/save.cpp b/source/sw/src/save.cpp
index d2faa8ad0..83cd40331 100644
--- a/source/sw/src/save.cpp
+++ b/source/sw/src/save.cpp
@@ -687,6 +687,20 @@ bool GameInterface::SaveGame(FSaveGameNode *sv)
 extern SWBOOL LoadGameOutsideMoveLoop;
 extern SWBOOL InMenuLevel;
 
+ bool GameInterface::CleanupForLoad() 
+ {
+     // Don't terminate until you've made sure conditions are valid for loading.
+     if (InMenuLevel)
+         Mus_Stop();
+     else
+     {
+         PauseAction();
+         TerminateLevel();
+     }
+     Terminate3DSounds();
+     return true;
+ }
+
 bool GameInterface::LoadGame(FSaveGameNode* sv)
 {
     MFILE_READ fil;
@@ -710,8 +724,6 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
     int StateNdx;
     int StateEndNdx;
 
-	if (!InMenuLevel) PauseAction();
-
     Saveable_Init();
 
 	auto filr = ReadSavegameChunk("snapshot.sw");
@@ -725,13 +737,6 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
         return false;
     }
 
-    // Don't terminate until you've made sure conditions are valid for loading.
-    if (InMenuLevel)
-        Mus_Stop();
-    else
-        TerminateLevel();
-    Terminate3DSounds();
-
     MREAD(&Level,sizeof(Level),1,fil);
     MREAD(&Skill,sizeof(Skill),1,fil);
 
diff --git a/source/sw/src/sprite.cpp b/source/sw/src/sprite.cpp
index fa404891f..efab6de31 100644
--- a/source/sw/src/sprite.cpp
+++ b/source/sw/src/sprite.cpp
@@ -745,7 +745,7 @@ KillSprite(int16_t SpriteNum)
                 {
                     mu = User[i];
 
-                    if (mu->WpnGoal == SpriteNum)
+                    if (mu && mu->WpnGoal == SpriteNum)
                     {
                         mu->WpnGoal = -1;
                     }