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

Use a common funcion for all monster healing

Browse Source 
Previously, the code for monster healing was repeated every time it
was needed; this commit sends it all through a common function, which
will make it easier to make changes to how monster healing works in
the future.

This is just a code reorganisation and won't have any gameplay
effect unless I made a mistake.
This commit is contained in:
Alex Smith
2025-01-12 18:20:13 +00:00
parent f0a0a74dcc
commit 97e0e934e8
13 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/zap.c
View File

@@ -434,9 +434,7 @@ bhitm(struct monst *mtmp, struct obj *otmp)
int delta = mtmp->mhpmax - mtmp->mhp;
wake = FALSE; /* wakeup() makes the target angry */
mtmp->mhp += healamt;
if (mtmp->mhp > mtmp->mhpmax)
mtmp->mhp = mtmp->mhpmax;
healmon(mtmp, healamt, 0);
/* plain healing must be blessed to cure blindness; extra
healing only needs to not be cursed, so spell always cures
[potions quaffed by monsters behave slightly differently;
@@ -4250,10 +4248,9 @@ zhitm(
case ZT_DEATH: /* death/disintegration */
if (abs(type) != ZT_BREATH(ZT_DEATH)) { /* death */
if (mon->data == &mons[PM_DEATH]) {
mon->mhpmax += mon->mhpmax / 2;
healmon(mon, mon->mhpmax * 3 / 2, mon->mhpmax / 2);
if (mon->mhpmax >= MAGIC_COOKIE)
mon->mhpmax = MAGIC_COOKIE - 1;
mon->mhp = mon->mhpmax;
tmp = 0;
break;
}