From 836d3d3186e78bc4aaf4fbba7f90596f620441c8 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Sat, 29 Jun 2019 00:19:46 +0200 Subject: [PATCH] Fixed Canarivore gas going through the floor --- src/p_inter.c | 1 + src/p_mobj.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index 163d47eab..cd1e80de2 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1702,6 +1702,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) case MT_CANARIVORE_GAS: // if player and gas touch, attach gas to player (overriding any gas that already attached) and apply slowdown effect + special->flags |= MF_NOGRAVITY|MF_NOCLIPHEIGHT; P_UnsetThingPosition(special); special->x = toucher->x - toucher->momx/2; special->y = toucher->y - toucher->momy/2; diff --git a/src/p_mobj.c b/src/p_mobj.c index 971c03e6b..5bf11134c 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8524,7 +8524,6 @@ void P_MobjThinker(mobj_t *mobj) momz = abs(mobj->momz); if (R_PointToDist2(0, 0, mobj->momx, mobj->momy) < momz) P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), momz); - mobj->flags |= MF_NOGRAVITY|MF_NOCLIPHEIGHT; mobj->flags2 |= MF2_AMBUSH; break; }