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

- this needs one more check.

This commit is contained in:
Christoph Oelckers 2017-02-27 10:52:29 +01:00
parent 073e63ed04
commit e84a2899f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_map.cpp
View File

@ -2283,7 +2283,7 @@ bool P_TryMove(AActor *thing, const DVector2 &pos,
}
if (!(thing->flags & MF_TELEPORT) && (!(thing->flags3 & MF3_FLOORHUGGER) || thing->flags5 & MF5_NODROPOFF))
{
if ((thing->flags & MF_MISSILE) && !(thing->flags6 & MF6_STEPMISSILE) && tm.floorz > thing->Z())
if ((thing->flags & MF_MISSILE) && !(thing->flags6 & MF6_STEPMISSILE) && tm.floorz > thing->Z() && !(thing->flags3 & MF3_FLOORHUGGER))
{ // [RH] Don't let normal missiles climb steps
goto pushline;
}
@ -2778,7 +2778,7 @@ bool P_CheckMove(AActor *thing, const DVector2 &pos, int flags)
{ // too big a step up
return false;
}
else if ((thing->flags & MF_MISSILE) && !(thing->flags6 & MF6_STEPMISSILE) && tm.floorz > newz)
else if ((thing->flags & MF_MISSILE) && !(thing->flags6 & MF6_STEPMISSILE) && tm.floorz > newz && !(thing->flags3 & MF3_FLOORHUGGER))
{ // [RH] Don't let normal missiles climb steps
return false;
}