From 7e2e62fd5c4f1c8798069af2e957818bed4f91d4 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 25 Oct 2009 19:39:43 +0000
Subject: [PATCH] - fixed: sector_t::GetHeightSec checked the wrong MoreFlags.

SVN r1936 (trunk)
---
 docs/rh-log.txt | 1 +
 src/r_defs.h    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 905f273264..6df94d23db 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 October 24, 2009  (Changes by Graf Zahl)
+- fixed: sector_t::GetHeightSec checked the wrong MoreFlags.
 - made max. view pitch a property of the renderer so that it's overridable without
   changing game code.
 - made SpawningMapThing an argument of AActor::StaticSpawn instead of a global
diff --git a/src/r_defs.h b/src/r_defs.h
index 88f4e98a82..623e475c40 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -588,7 +588,7 @@ struct sector_t
 
 	sector_t *GetHeightSec() const 
 	{
-		return (MoreFlags & SECF_IGNOREHEIGHTSEC)? NULL : heightsec;
+		return (heightsec && !(heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC))? heightsec : NULL;
 	}
 
 	void ChangeLightLevel(int newval)