From 8c317240c1ec3141dd8fa9a0ab0cee443f48c70b Mon Sep 17 00:00:00 2001 From: Rick Hoxie Date: Sat, 28 Mar 2020 08:18:17 -0500 Subject: [PATCH 1/4] fix: remove is_worn check for heat_metal --- src/spell_off.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/spell_off.c b/src/spell_off.c index 304eef7..ee00fb4 100644 --- a/src/spell_off.c +++ b/src/spell_off.c @@ -425,8 +425,8 @@ DEFINE_SPELL_FUN (spell_heat_metal) { if (saves_spell (level + 2, victim, DAM_FIRE) || IS_SET (victim->imm_flags, RES_FIRE)) { - send_to_char ("Your spell had no effect.\n\r", ch); - send_to_char ("You feel momentarily warmer.\n\r", victim); + printf_to_char(ch, "Your spell had no effect.\n\r"); + printf_to_char(victim, "You feel momentarily warmer.\n\r"); return; } @@ -447,9 +447,8 @@ DEFINE_SPELL_FUN (spell_heat_metal) { if (!(is_weapon || is_armor)) continue; - /* Flaming weapons being wielded are ignored. */ - is_worn = (obj_lose->wear_loc != WEAR_LOC_NONE); - if (is_worn && is_weapon && IS_WEAPON_STAT (obj_lose, WEAPON_FLAMING)) + /* Flaming weapons being are ignored. */ + if (is_weapon && IS_WEAPON_STAT (obj_lose, WEAPON_FLAMING)) continue; success = TRUE; From bbf16f52831d67208ce1ff2442c5666c42d9929b Mon Sep 17 00:00:00 2001 From: Rick <53785541+rhoxie21@users.noreply.github.com> Date: Sat, 28 Mar 2020 10:18:45 -0500 Subject: [PATCH 2/4] Update spell_off.c --- src/spell_off.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spell_off.c b/src/spell_off.c index ee00fb4..9cfbfb5 100644 --- a/src/spell_off.c +++ b/src/spell_off.c @@ -419,7 +419,7 @@ DEFINE_SPELL_FUN (spell_heat_metal) { OBJ_T *obj_lose, *obj_next; int dam = 0; bool success = FALSE; - bool is_weapon, is_armor, is_worn, can_drop; + bool is_weapon, is_armor, can_drop; bool fumbled, drop_item; if (saves_spell (level + 2, victim, DAM_FIRE) From e58d5747a89c1be3e108a57f7d6daa7848f6d135 Mon Sep 17 00:00:00 2001 From: Rick Hoxie Date: Sat, 28 Mar 2020 10:28:12 -0500 Subject: [PATCH 3/4] fix: fix mistake made --- src/spell_off.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/spell_off.c b/src/spell_off.c index ee00fb4..7b70a09 100644 --- a/src/spell_off.c +++ b/src/spell_off.c @@ -452,6 +452,7 @@ DEFINE_SPELL_FUN (spell_heat_metal) { continue; success = TRUE; + is_worn = (obj_lose->wear_loc != WEAR_LOC_NONE); can_drop = char_can_drop_obj (victim, obj_lose); drop_item = FALSE; From bb7fbc8ee42871d15b53080288415e13d4af5979 Mon Sep 17 00:00:00 2001 From: Rick Hoxie Date: Sat, 28 Mar 2020 10:32:40 -0500 Subject: [PATCH 4/4] fix: correct between branch and local --- src/spell_off.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spell_off.c b/src/spell_off.c index 2346b91..7b70a09 100644 --- a/src/spell_off.c +++ b/src/spell_off.c @@ -419,7 +419,7 @@ DEFINE_SPELL_FUN (spell_heat_metal) { OBJ_T *obj_lose, *obj_next; int dam = 0; bool success = FALSE; - bool is_weapon, is_armor, can_drop; + bool is_weapon, is_armor, is_worn, can_drop; bool fumbled, drop_item; if (saves_spell (level + 2, victim, DAM_FIRE)