From 27fdb815b93d28b751f143658ea1058a8035eaac Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 12 Sep 2022 00:06:48 -0400 Subject: [PATCH] Give solid to gun & particles Fixes hitboxes for the gun, IDK why particle isn't working. Also fix typo error --- src/info.c | 4 ++-- src/p_map.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/info.c b/src/info.c index 56892d9c9..e011e7874 100644 --- a/src/info.c +++ b/src/info.c @@ -24091,7 +24091,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // mass 0, // damage sfx_None, // activesound - MF_SCENERY|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags + MF_SOLID|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags S_NULL // raisestate }, @@ -24172,7 +24172,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // mass 0, // damage sfx_None, // activesound - MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags + MF_SOLID|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags S_NULL // raisestate }, diff --git a/src/p_map.c b/src/p_map.c index 0c490ce41..e00cbea1c 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -784,7 +784,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return BMIT_CONTINUE; } - if (thing->type == MT_SHRINK_GUN) + if (tmthing->type == MT_SHRINK_GUN) { // Use special collision for the laser gun. // The laser sprite itself is just a visual,