Skip to content

fix: remove is_worn check for heat_metal #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhoxie21 wants to merge 5 commits into
base: unstable
Choose a base branch
from
Open

fix: remove is_worn check for heat_metal #195

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c31724
fix: remove is_worn check for heat_metal
rhoxie21 Mar 28, 2020
bbf16f5
Update spell_off.c
rhoxie21 Mar 28, 2020
e58d574
fix: fix mistake made
rhoxie21 Mar 28, 2020
0b454e0
Merge branch 'heat_metal' of https://github.com/rhoxie21/BaseMUD into…
rhoxie21 Mar 28, 2020
bb7fbc8
fix: correct between branch and local
rhoxie21 Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/spell_off.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -447,12 +447,12 @@ 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;
is_worn = (obj_lose->wear_loc != WEAR_LOC_NONE);
can_drop = char_can_drop_obj (victim, obj_lose);
drop_item = FALSE;

Expand Down