zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: All missiles could climb steps in P_TryMove() because of an extra ampersand turning & into &&.

Browse source 
SVN r3578 (trunk)
This commit is contained in:
Randy Heit 2012-04-22 02:30:26 +00:00
parent 5123a6b74b
commit 9276e6138e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_map.cpp
View file

@ -1785,12 +1785,12 @@ bool P_TryMove (AActor *thing, fixed_t x, fixed_t y,
} }
if (!(thing->flags & MF_TELEPORT) && !(thing->flags3 & MF3_FLOORHUGGER)) if (!(thing->flags & MF_TELEPORT) && !(thing->flags3 & MF3_FLOORHUGGER))
{ {
if (tm.floorz-thing->z > thing->MaxStepHeight) if ((thing->flags & MF_MISSILE) && !(thing->flags6 & MF6_STEPMISSILE) && tm.floorz > thing->z)
{ // too big a step up { // [RH] Don't let normal missiles climb steps
goto pushline; goto pushline;
} }
else if ((thing->flags & MF_MISSILE)&& !(thing->flags6 && MF6_STEPMISSILE) && tm.floorz > thing->z) if (tm.floorz-thing->z > thing->MaxStepHeight)
{ // [RH] Don't let normal missiles climb steps { // too big a step up
goto pushline; goto pushline;
} }
else if (thing->z < tm.floorz) else if (thing->z < tm.floorz)