From 88dc34818eae9cf230cd835cf56c041dca34c39e Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Fri, 28 Jun 2019 21:40:20 +0100 Subject: [PATCH 1/2] Give MT_WOODDEBRIS the MF_SCENERY flag, so it can be made to join its MT_ROCKCRUMBLEn friends in dying after hitting the ground. (Untested) --- src/info.c | 2 +- src/p_mobj.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/info.c b/src/info.c index 8646a2ef1..074e31ba2 100644 --- a/src/info.c +++ b/src/info.c @@ -19480,7 +19480,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 100, // mass 0, // damage sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT, // flags + MF_NOBLOCKMAP|MF_NOCLIPTHING|MF_RUNSPAWNFUNC|MF_NOCLIPHEIGHT|MF_SCENERY, // flags S_NULL // raisestate }, diff --git a/src/p_mobj.c b/src/p_mobj.c index 8bacd212f..971c03e6b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7332,6 +7332,7 @@ void P_MobjThinker(mobj_t *mobj) case MT_ROCKCRUMBLE14: case MT_ROCKCRUMBLE15: case MT_ROCKCRUMBLE16: + case MT_WOODDEBRIS: if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height) && mobj->state != &states[mobj->info->deathstate]) { From 836d3d3186e78bc4aaf4fbba7f90596f620441c8 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Sat, 29 Jun 2019 00:19:46 +0200 Subject: [PATCH 2/2] 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; }