From f421f2411d93b9b141305059251aef0aebabd17b Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sat, 12 May 2012 23:21:22 +0000 Subject: [PATCH] - Fixed: BOUNCE_AutoOff should not trigger when bouncing off a ceiling, since it will always pass the velocity check. SVN r3643 (trunk) --- src/p_mobj.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index c5f9bc51e..730dc304a 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -1376,8 +1376,8 @@ bool AActor::FloorBounceMissile (secplane_t &plane) if (abs(velz) < (fixed_t)(Mass * GetGravity() / 64)) velz = 0; } - else if (BounceFlags & BOUNCE_AutoOff) - { + else if (plane.c > 0 && BounceFlags & BOUNCE_AutoOff) + { // AutoOff only works when bouncing off a floor, not a ceiling. if (!(flags & MF_NOGRAVITY) && (velz < 3*FRACUNIT)) BounceFlags &= ~BOUNCE_TypeMask; }