From 74642ca6263dcd6b80052a0cfe3dc89e964f5ab0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 1 Mar 2009 10:12:12 +0000
Subject: [PATCH] - Fixed: AActor::SetOrigin must call P_FindFloorCeiling to
 get the true   floor and ceiling heights. Otherwise the actor will fall right
 through   3DMidtex textures (and 3D-floors.)

SVN r1456 (trunk)
---
 docs/rh-log.txt  | 10 +++++++++-
 src/p_maputl.cpp |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 62dff03e3..d16d53c9c 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,12 @@
-February 28, 2009
+March 1, 2009  (Changes by Graf Zahl)
+- Fixed: AActor::SetOrigin must call P_FindFloorCeiling to get the true
+  floor and ceiling heights. Otherwise the actor will fall right through
+  3DMidtex textures (and 3D-floors.)
+
+February 29, 2008
+- Version bump to 2.3.0.
+
+February 28, 2009
 - Fixed: The TeleporterBeacon tried to enter its See state rather than its
   Drop state. Also changed it to fade out when it's done rather than
   disappearing abruptly.
diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp
index 6ad565f1b..194d8950f 100644
--- a/src/p_maputl.cpp
+++ b/src/p_maputl.cpp
@@ -564,6 +564,7 @@ void AActor::SetOrigin (fixed_t ix, fixed_t iy, fixed_t iz)
 	LinkToWorld ();
 	floorz = Sector->floorplane.ZatPoint (ix, iy);
 	ceilingz = Sector->ceilingplane.ZatPoint (ix, iy);
+	P_FindFloorCeiling(this, true);
 }
 
 FBlockNode *FBlockNode::FreeBlocks = NULL;