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

Use DEADMONSTER instead of checking mhp

Browse Source
This commit is contained in:
Pasi Kallinen
2018-08-30 20:05:18 +03:00
parent f1d0636ba0
commit d2eba695c8
24 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/potion.c
View File

@@ -1464,7 +1464,7 @@ int how;
wake_nearto(tx, ty, mon->data->mlevel * 10);
mon->mhp -= d(2, 6);
/* should only be by you */
if (mon->mhp < 1)
if (DEADMONSTER(mon))
killed(mon);
else if (is_were(mon->data) && !is_human(mon->data))
new_were(mon); /* revert to human */
@@ -1487,7 +1487,7 @@ int how;
pline("%s rusts.", Monnam(mon));
mon->mhp -= d(1, 6);
/* should only be by you */
if (mon->mhp < 1)
if (DEADMONSTER(mon))
killed(mon);
}
break;
@@ -1502,7 +1502,7 @@ int how;
if (!is_silent(mon->data))
wake_nearto(tx, ty, mon->data->mlevel * 10);
mon->mhp -= d(obj->cursed ? 2 : 1, obj->blessed ? 4 : 8);
if (mon->mhp < 1) {
if (DEADMONSTER(mon)) {
if (your_fault)
killed(mon);
else
@@ -1523,7 +1523,7 @@ int how;
*/
}
/* target might have been killed */
if (mon->mhp > 0) {
if (!DEADMONSTER(mon)) {
if (angermon)
wakeup(mon, TRUE);
else