From db413996907f79d75e7d9344e531a87002c4525e Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Mon, 29 Sep 2025 22:27:56 +0200 Subject: [PATCH] Fix flame shield not melting items (closes #140) --- src/k_collide.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index e66d35f40..eefd54f9b 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -63,7 +63,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2) if (t2->player->hyudorotimer) return true; // no interaction - if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME)) { // Melt item S_StartSound(t2, sfx_s3k43); @@ -159,7 +159,7 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2) damageitem = true; - if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME)) { // Melt item S_StartSound(t2, sfx_s3k43); @@ -249,7 +249,7 @@ boolean K_EggItemCollide(mobj_t *t1, mobj_t *t2) t2->player->roulettetype = KROULETTETYPE_EGGMAN; } - if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME)) { // Melt item S_StartSound(t2, sfx_s3k43); @@ -381,7 +381,7 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2) if (t1->health > 1) S_StartSound(t2, sfx_bsnipe); - if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME)) { // Melt item S_StartSound(t2, sfx_s3k43);