From c61fcc8db6d54585d6efbfca9514cae532801655 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 14 Jan 2019 21:55:10 -0500 Subject: [PATCH] Fix really dumb flags on MT_SPBEXPLOSION --- src/info.c | 2 +- src/p_inter.c | 2 +- src/p_mobj.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/info.c b/src/info.c index 93804b0c..ea9eac9d 100644 --- a/src/info.c +++ b/src/info.c @@ -15861,7 +15861,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 100, // mass 1, // damage sfx_None, // activesound - MF_BOUNCE|MF_FLOAT|MF_NOCLIPTHING|MF_MISSILE|MF_SHOOTABLE|MF_DONTENCOREMAP, // flags + MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_DONTENCOREMAP, // flags S_NULL // raisestate }, diff --git a/src/p_inter.c b/src/p_inter.c index 23cf1892..dd27858f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -588,7 +588,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0) { - player->powers[pw_flashing] = 0; + //player->powers[pw_flashing] = 0; K_DropHnextList(player); K_StripItems(player); } diff --git a/src/p_mobj.c b/src/p_mobj.c index 4379b958..f71ff209 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7441,10 +7441,10 @@ void P_MobjThinker(mobj_t *mobj) break; case MT_SSMINE: case MT_SPBEXPLOSION: - if (mobj->health > -100) + if (mobj->extravalue2 != -100) { P_SetMobjState(mobj, mobj->info->deathstate); - mobj->health = -100; + mobj->extravalue2 = -100; } else {