various tests of flaming monsters

This change adds a new flaming() macro and uses it in several places
where the list of flaming monsters was tested.  on_fire() didn't list
salamanders as already being on fire, but should have.  A couple other
cases were not updated to include flaming sphere.
This commit is contained in:
cohrs
2003-09-26 00:37:24 +00:00
parent 96b56a7bd7
commit 929f9ce2c7
7 changed files with 11 additions and 19 deletions

View File

@@ -1605,9 +1605,7 @@ register struct attack *mattk;
break;
case AD_SLIM:
if (negated) break; /* physical damage only */
if (!rn2(4) && mdef->data != &mons[PM_FIRE_VORTEX] &&
mdef->data != &mons[PM_FIRE_ELEMENTAL] &&
mdef->data != &mons[PM_SALAMANDER] &&
if (!rn2(4) && !flaming(mdef->data) &&
mdef->data != &mons[PM_GREEN_SLIME]) {
You("turn %s into slime.", mon_nam(mdef));
(void) newcham(mdef, &mons[PM_GREEN_SLIME], FALSE, FALSE);