From 852ed6cd04eb50c53b45fc71c1764ce13112e5d6 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 11 May 2016 19:39:08 +0200 Subject: [PATCH] - un-revert P_CheckMove fix. --- src/p_map.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index d1fc77268..88366baac 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -2535,11 +2535,7 @@ bool P_CheckMove(AActor *thing, const DVector2 &pos, int flags) } else if ((flags & PCM_DROPOFF) && !(thing->flags & (MF_FLOAT|MF_DROPOFF))) { - const DVector3 oldpos = thing->Pos(); - thing->SetOrigin(pos.X, pos.Y, newz, true); - bool hcheck = (newz - thing->dropoffz > thing->MaxDropOffHeight); - thing->SetOrigin(oldpos, true); - if (hcheck) + if (newz - tm.dropoffz > thing->MaxDropOffHeight) { return false; }