From 6864705b674cdbd77b28f5ab03fdf0b26cc1dbd4 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 30 Oct 2020 19:00:37 -0700 Subject: [PATCH] Fix fuckup --- src/info.c | 2 +- src/k_collide.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/info.c b/src/info.c index d8b814841..4782fb0b5 100644 --- a/src/info.c +++ b/src/info.c @@ -22946,7 +22946,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 100, // mass 0, // damage sfx_None, // activesound - MF_SLIDEME|MF_SPECIAL|MF_DONTENCOREMAP, // flags + MF_SLIDEME|MF_DONTENCOREMAP, // flags S_NULL // raisestate }, diff --git a/src/k_collide.c b/src/k_collide.c index 48b20c8a1..79abdfa94 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -409,6 +409,9 @@ boolean K_FloatingItemCollide(mobj_t *t1, mobj_t *t2) { player_t * player = t2->player; + if (t1->health < 1) + return true; + if (! player) return true; @@ -418,8 +421,8 @@ boolean K_FloatingItemCollide(mobj_t *t1, mobj_t *t2) if ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0) return true; - player->kartstuff[k_itemtype] = t2->threshold; - player->kartstuff[k_itemamount] += t2->movecount; + player->kartstuff[k_itemtype] = t1->threshold; + player->kartstuff[k_itemamount] += t1->movecount; if (player->kartstuff[k_itemamount] > 255) player->kartstuff[k_itemamount] = 255; @@ -430,6 +433,7 @@ boolean K_FloatingItemCollide(mobj_t *t1, mobj_t *t2) t1->destscale = mapobjectscale>>4; t1->scalespeed <<= 1; - t1->flags &= ~MF_SPECIAL; + t1->health--; + return false; }