nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

various tests of flaming monsters

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eat.c
View File

@@ -471,10 +471,7 @@ register int pm;
return;
}
case PM_GREEN_SLIME:
if (!Slimed && !Unchanging &&
youmonst.data != &mons[PM_FIRE_VORTEX] &&
youmonst.data != &mons[PM_FIRE_ELEMENTAL] &&
youmonst.data != &mons[PM_SALAMANDER] &&
if (!Slimed && !Unchanging && !flaming(youmonst.data) &&
youmonst.data != &mons[PM_GREEN_SLIME]) {
You("don't feel very well.");
Slimed = 10L;
@@ -1728,10 +1725,7 @@ struct obj *otmp;
!poly_when_stoned(youmonst.data));
if (mnum == PM_GREEN_SLIME)
stoneorslime = (!Unchanging &&
youmonst.data != &mons[PM_FIRE_VORTEX] &&
youmonst.data != &mons[PM_FIRE_ELEMENTAL] &&
youmonst.data != &mons[PM_SALAMANDER] &&
stoneorslime = (!Unchanging && !flaming(youmonst.data) &&
youmonst.data != &mons[PM_GREEN_SLIME]);
if (cadaver && mnum != PM_LIZARD && mnum != PM_LICHEN) {