From 4bc0531bf7919ddf0caf7e2cf8fbd41c561d7bd1 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 29 Feb 2020 12:55:12 +0100
Subject: [PATCH] - disabled help screen in Exhumed and save menus in Deer
 Huntin'.

---
 source/common/menu/imagescroller.cpp | 6 +++++-
 source/exhumed/src/exhumed.cpp       | 2 ++
 source/exhumed/src/movie.cpp         | 7 +++----
 source/rr/src/d_menu.cpp             | 2 +-
 wadsrc/static/engine/menudef.txt     | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/source/common/menu/imagescroller.cpp b/source/common/menu/imagescroller.cpp
index 52e5b6ac8..7f88e7be4 100644
--- a/source/common/menu/imagescroller.cpp
+++ b/source/common/menu/imagescroller.cpp
@@ -51,7 +51,11 @@
 
 void ImageScreen::Drawer()
 {
-	if (mDesc->type == 0)
+	if (mDesc == nullptr)
+	{
+		// don't let bogus definitions crash this.
+	}
+	else if (mDesc->type == 0)
 	{
 		auto tileindexp = NameToTileIndex.CheckKey(FName(mDesc->text, true));
 		int tileindex = 0;
diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp
index b468bb1d0..a6813c458 100644
--- a/source/exhumed/src/exhumed.cpp
+++ b/source/exhumed/src/exhumed.cpp
@@ -75,6 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "savegamehelp.h"
 #include "c_dispatch.h"
 #include "s_soundinternal.h"
+#include "common/menu/menu.h"
 
 BEGIN_PS_NS
 
@@ -1835,6 +1836,7 @@ int GameInterface::app_main()
     int stopTitle = kFalse;
     levelnew = 1;
 
+    help_disabled = true;
     // Create the global level table. Parts of the engine need it, even though the game itself does not.
     for (int i = 0; i <= 32; i++)
     {
diff --git a/source/exhumed/src/movie.cpp b/source/exhumed/src/movie.cpp
index b082c14e7..9e5c9fbef 100644
--- a/source/exhumed/src/movie.cpp
+++ b/source/exhumed/src/movie.cpp
@@ -190,6 +190,9 @@ static void ServeSample(const char** ptr, uint32_t* length)
 
 void PlayMovie(const char* fileName)
 {
+    CurFrame = TileFiles.tileCreate(kMovieTile, 320, 200);
+    if (CurFrame == nullptr) return;
+
     int bDoFade = kTrue;
     int hFx = -1;
 	auto fp = fileSystem.OpenFileReader(fileName, 0);
@@ -199,10 +202,6 @@ void PlayMovie(const char* fileName)
 		return;
 	}
 
-	tileLoad(kMovieTile);
-	CurFrame = TileFiles.tileMakeWritable(kMovieTile);
-
-
     fp.Read(lh, sizeof(lh));
 
     // sound stuff
diff --git a/source/rr/src/d_menu.cpp b/source/rr/src/d_menu.cpp
index 318f43877..73948ea54 100644
--- a/source/rr/src/d_menu.cpp
+++ b/source/rr/src/d_menu.cpp
@@ -652,7 +652,7 @@ void GameInterface::MenuClosed()
 
 bool GameInterface::CanSave()
 {
-	if (ud.recstat == 2) return false;
+	if (ud.recstat == 2 || DEER) return false;
 	auto &myplayer = *g_player[myconnectindex].ps;
 	if (sprite[myplayer.i].extra <= 0)
 	{
diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt
index 26681ea32..a4f79dcee 100644
--- a/wadsrc/static/engine/menudef.txt
+++ b/wadsrc/static/engine/menudef.txt
@@ -469,7 +469,7 @@ ImageScroller "HelpMenu"
 			animatedtransition
 		}
 	}
-	ifgame(Redneck, RedneckRides)
+	ifgame(Redneck, RedneckRides, Deer)
 	{
 		ImageItem "TEXTSTORY"
 		ImageItem "F1HELP"