From 7783aec8a9f516d6871e83d0618e0c28b06d6edf Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Thu, 29 Mar 2012 05:23:04 +0000 Subject: [PATCH] - Fixed: Missiles with MF6_STEPMISSILE set would be allowed to cross lines they could step over, but their Z position would not actually be moved up, so the subsequent call to P_ZMovement() would destroy it because it was in the floor. SVN r3491 (trunk) --- src/p_map.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/p_map.cpp b/src/p_map.cpp index 2c4cbe1ea..b5622092a 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -1788,6 +1788,15 @@ bool P_TryMove (AActor *thing, fixed_t x, fixed_t y, { goto pushline; } + if (thing->flags & MF_MISSILE) + { + thing->z = tm.floorz; + // If moving down, cancel vertical component of the velocity + if (thing->velz < 0) + { + thing->velz = 0; + } + } } }