From 9c89b02bad37afc09a2cf21e12f8e213f1887b50 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Fri, 4 Jul 2025 10:46:56 -0400 Subject: [PATCH] Use flamestore for some flameshield stuff --- src/k_collide.c | 12 ++++++------ src/p_inter.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index f1800262f..e18d8e05a 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -60,7 +60,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2) if (t2->player->hyudorotimer) return true; // no interaction - if (t2->player->flamedash && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) { // Melt item S_StartSound(t2, sfx_s3k43); @@ -156,7 +156,7 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2) damageitem = true; - if (t2->player->flamedash && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) { // Melt item S_StartSound(t2, sfx_s3k43); @@ -246,7 +246,7 @@ boolean K_EggItemCollide(mobj_t *t1, mobj_t *t2) t2->player->roulettetype = KROULETTETYPE_EGGMAN; } - if (t2->player->flamedash && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) { // Melt item S_StartSound(t2, sfx_s3k43); @@ -378,7 +378,7 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2) if (t1->health > 1) S_StartSound(t2, sfx_bsnipe); - if (t2->player->flamedash && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) + if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD)) { // Melt item S_StartSound(t2, sfx_s3k43); @@ -689,8 +689,8 @@ boolean K_SMKIceBlockCollide(mobj_t *t1, mobj_t *t2) boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) { - const boolean flameT1 = ((t1->player->flamedash > 0) && (t1->player->flametimer > 0)); - const boolean flameT2 = ((t2->player->flamedash > 0) && (t2->player->flametimer > 0)); + const boolean flameT1 = ((t1->player->flamestore > 0) && (t1->player->flametimer > 0)); + const boolean flameT2 = ((t2->player->flamestore > 0) && (t2->player->flametimer > 0)); boolean t1Condition = false; boolean t2Condition = false; diff --git a/src/p_inter.c b/src/p_inter.c index 294b820bf..c51f75309 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -574,7 +574,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) // kill if (player->invincibilitytimer > 0 || player->growshrinktimer > 0 - || player->flamedash > 0) + || player->flamestore > 0) { P_KillMobj(special, toucher, toucher, DMG_NORMAL); return;