From 2e02a4fa362c4d3f9aef1655c64948f6ab7fa1c2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 11 Jul 2006 11:36:34 +0000
Subject: [PATCH] SVN r246 (trunk)

---
 src/p_map.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/p_map.cpp b/src/p_map.cpp
index b3cf86831..498bd82f1 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -1686,7 +1686,8 @@ BOOL P_TryMove (AActor *thing, fixed_t x, fixed_t y,
 			else
 			{
 				// special logic to move a monster off a dropoff
-				if (thing->dropoffz - tmdropoffz > thing->MaxDropOffHeight) return false;
+				if (thing->floorz - floorz > thing->MaxDropOffHeight ||
+					thing->dropoffz - tmdropoffz > thing->MaxDropOffHeight) return false;
 			}
 		}
 		if (thing->flags2 & MF2_CANTLEAVEFLOORPIC