zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- un-revert P_CheckMove fix.

This commit is contained in:
Christoph Oelckers 2016-05-11 19:39:08 +02:00
parent 769521b2e1
commit 852ed6cd04
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/p_map.cpp
View File

@ -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))) else if ((flags & PCM_DROPOFF) && !(thing->flags & (MF_FLOAT|MF_DROPOFF)))
{ {
const DVector3 oldpos = thing->Pos(); if (newz - tm.dropoffz > thing->MaxDropOffHeight)
thing->SetOrigin(pos.X, pos.Y, newz, true);
bool hcheck = (newz - thing->dropoffz > thing->MaxDropOffHeight);
thing->SetOrigin(oldpos, true);
if (hcheck)
{ {
return false; return false;
} }