From 051ae3224f0c46532fa378f94f0c62f52980afd9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 18 Sep 2010 12:37:22 +0000
Subject: [PATCH] - fixed: The subsector serializing code accessed the
 subsector array before validating the index. - added episode names to episode
 definitions of Doom 1 and Chex Quest.

SVN r2820 (trunk)
---
 src/p_saveg.cpp                 | 2 +-
 wadsrc/static/mapinfo/chex.txt  | 1 +
 wadsrc/static/mapinfo/doom1.txt | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp
index 52ebf88d2..7381aaf31 100644
--- a/src/p_saveg.cpp
+++ b/src/p_saveg.cpp
@@ -590,7 +590,7 @@ void P_SerializeSubsectors(FArchive &arc)
 				by = 0;
 				for(int j=0;j<8;j++)
 				{
-					if ((subsectors[i+j].flags & SSECF_DRAWN) && i+j<numsubsectors)
+					if (i+j<numsubsectors && (subsectors[i+j].flags & SSECF_DRAWN))
 					{
 						by |= (1<<j);
 					}
diff --git a/wadsrc/static/mapinfo/chex.txt b/wadsrc/static/mapinfo/chex.txt
index 5a76298cb..469277681 100644
--- a/wadsrc/static/mapinfo/chex.txt
+++ b/wadsrc/static/mapinfo/chex.txt
@@ -109,6 +109,7 @@ clearepisodes
 episode e1m1
 {
 	picname = "M_EPI1"
+	name = "Chex Quest"
 	key = "k"
 }
 
diff --git a/wadsrc/static/mapinfo/doom1.txt b/wadsrc/static/mapinfo/doom1.txt
index 064f3777a..62040ca15 100644
--- a/wadsrc/static/mapinfo/doom1.txt
+++ b/wadsrc/static/mapinfo/doom1.txt
@@ -21,28 +21,31 @@ clearepisodes
 episode e1m1
 {
 	picname = "M_EPI1"
+	name = "Knee-Deep in the Dead"
 	key = "k"
 }
 
 episode e2m1
 {
 	picname = "M_EPI2"
+	name = "The Shores of Hell"
 	key = "t"
 }
 
 episode e3m1
 {
 	picname = "M_EPI3"
+	name = "Inferno"
 	key = "i"
 }
 
 episode e4m1
 {
 	picname = "M_EPI4"
+	name = "Thy Flesh Consumed"
 	key = "t"
 	optional
-
-}
+} 
 
 // Registered/Retail Episode 1