From 3dba084fd906e13193583cc06b9349666585840f Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 24 Oct 2018 17:16:32 -0400 Subject: [PATCH] Give karma items their own hitbox size Bombs & fakes get 24, items get 36. Technically a slight nerf to bomb, but it's more consistent and it's so tiny of a change that it'll be unnoticeable I feel :V --- src/info.c | 2 +- src/p_mobj.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/info.c b/src/info.c index 2efa68ab..00c69158 100644 --- a/src/info.c +++ b/src/info.c @@ -17174,7 +17174,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed - 26*FRACUNIT, // radius + 24*FRACUNIT, // radius 52*FRACUNIT, // height -1, // display offset 0, // mass diff --git a/src/p_mobj.c b/src/p_mobj.c index 84163f1c..2e287da0 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8395,6 +8395,13 @@ void P_MobjThinker(mobj_t *mobj) mobj->color = mobj->target->color; mobj->colorized = (mobj->target->player->kartstuff[k_comebackmode]); + // Give items an item-sized hitbox + if (mobj->target->player->kartstuff[k_comebackmode] == 1) + mobj->radius = 36*mobj->target->scale; + else + mobj->radius = 24*mobj->target->scale; + mobj->height = 2*mobj->radius; + if (mobj->target->player->kartstuff[k_comebacktimer] > 0) { if (mobj->state != &states[mobj->info->spawnstate])