From b74939e5f04443a115e03633f3a4dbbc080f4a03 Mon Sep 17 00:00:00 2001 From: Erik Lunna Date: Thu, 5 Dec 2024 17:45:15 +0100 Subject: [PATCH] Fix: Withering res check prevented regeneration after getting partial disintegration res. --- include/youprop.h | 2 +- src/allmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/youprop.h b/include/youprop.h index 0e0202c77..a8334af15 100644 --- a/include/youprop.h +++ b/include/youprop.h @@ -404,7 +404,7 @@ #define HWithering u.uprops[WITHERING].intrinsic #define EWithering u.uprops[WITHERING].extrinsic #define Withering (HWithering || EWithering) && !BWithering -#define BWithering Disint_resistance /* parallel resistances */ +#define BWithering EDisint_resistance /* parallel resistances */ #define Rabid u.uprops[RABID].intrinsic diff --git a/src/allmain.c b/src/allmain.c index 107fbcfc6..ebdbd7654 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -650,7 +650,7 @@ regen_hp(int wtcap) once u.mh reached u.mhmax; that may have been convenient for the player, but it didn't make sense for gameplay...] */ if (u.uhp < u.uhpmax - && vamp_can_regen() + && vamp_can_regen() && !Rabid /* Non-undead cannot regenerate in the valley */ && (!Is_valley(&u.uz) || is_undead(gy.youmonst.data))