From eafb9da2c11126991a68dd994241ac21a5652871 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Tue, 23 Aug 2011 02:39:20 +0000
Subject: [PATCH] - Backported GZDoom r1246:

* Fixed possible crash when texture for menu item patch cannot be loaded. (From Alexey's Mac OS X port.)
* Fixed iwadinfo.txt definitions of Hexen and Freedoom demos (also from Alexey's port.)
* Added missing LOF_NOJUMP definition.


SVN r3284 (trunk)
---
 src/menu/listmenu.cpp              | 6 ++++--
 wadsrc/static/actors/constants.txt | 1 +
 wadsrc/static/iwadinfo.txt         | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/menu/listmenu.cpp b/src/menu/listmenu.cpp
index 2f14ee5e1..5e9fc13d1 100644
--- a/src/menu/listmenu.cpp
+++ b/src/menu/listmenu.cpp
@@ -553,7 +553,9 @@ void FListMenuItemPatch::Drawer(bool selected)
 }
 
 int FListMenuItemPatch::GetWidth() 
-{ 
-	return TexMan[mTexture]->GetScaledWidth(); 
+{
+	return mTexture.isValid() 
+		? TexMan[mTexture]->GetScaledWidth() 
+		: 0;
 }
 
diff --git a/wadsrc/static/actors/constants.txt b/wadsrc/static/actors/constants.txt
index fb391ee91..fa8f37e95 100644
--- a/wadsrc/static/actors/constants.txt
+++ b/wadsrc/static/actors/constants.txt
@@ -61,6 +61,7 @@ const int LOF_NOSOUNDCHECK = 2;
 const int LOF_DONTCHASEGOAL = 4;
 const int LOF_NOSEESOUND = 8;
 const int LOF_FULLVOLSEESOUND = 16;
+const int LOF_NOJUMP = 32;
 
 // Flags for A_Respawn
 const int RSF_FOG = 1;
diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt
index efdf836a5..1d4c9c65c 100644
--- a/wadsrc/static/iwadinfo.txt
+++ b/wadsrc/static/iwadinfo.txt
@@ -115,7 +115,7 @@ IWad
 	Name = "Hexen: Demo Version"
 	Game = "Hexen"
 	Config = "Hexen"
-	Mapinfo = "mapinfo/doom2.txt"
+	Mapinfo = "mapinfo/hexen.txt"
 	Compatibility = "Shareware"
 	MustContain = "TITLE", "MAP01", "WINNOWR"
 	BannerColors = "f0 f0 f0", "6b 3c 18"
@@ -205,7 +205,7 @@ IWad
 	Autoname = "Freedoom1"
 	Game = "Doom"
 	Config = "Doom"
-	Mapinfo = "mapinfo/doom2.txt"
+	Mapinfo = "mapinfo/doom1.txt"
 	MustContain = "E1M1", "FREEDOOM"
 	BannerColors = "32 54 43", "c6 dc d1"
 }