From 9276e6138e1114a3bb6221d77611d023774153ce Mon Sep 17 00:00:00 2001 From: Randy Heit <rheit@zdoom.fake> Date: Sun, 22 Apr 2012 02:30:26 +0000 Subject: [PATCH] - Fixed: All missiles could climb steps in P_TryMove() because of an extra ampersand turning & into &&. SVN r3578 (trunk) --- src/p_map.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index cd4e30cb6..9b5c2101a 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -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 (tm.floorz-thing->z > thing->MaxStepHeight) - { // too big a step up + if ((thing->flags & MF_MISSILE) && !(thing->flags6 & MF6_STEPMISSILE) && tm.floorz > thing->z) + { // [RH] Don't let normal missiles climb steps goto pushline; } - else if ((thing->flags & MF_MISSILE)&& !(thing->flags6 && MF6_STEPMISSILE) && tm.floorz > thing->z) - { // [RH] Don't let normal missiles climb steps + if (tm.floorz-thing->z > thing->MaxStepHeight) + { // too big a step up goto pushline; } else if (thing->z < tm.floorz)