intrinsics revamp (trunk only)
Simplify many of the intrinsics macros from
#define xxx_resistance (Hxxx || Exxx || resists_xxx(&youmonst))
down to
#define xxx_resistance (Hxxx || Exxx)
by setting or clearing an extra bit in Hxxx during polymorph so that the
resists_xxx() check becomes implicit.
Unfornately there were lots of places in the code that treat Hxxx
as a timeout number--primarily for Stunned, Confused, and Hallucination;
Stunned happens to be one of the revised macros--rather than as a bit
mask, so this patch needed a lot more changes than originally antipated.
This commit is contained in:
@@ -686,9 +686,9 @@ int how;
|
||||
newuhs(FALSE);
|
||||
}
|
||||
/* cure impending doom of sickness hero won't have time to fix */
|
||||
if ((Sick & TIMEOUT) == 1) {
|
||||
if ((Sick & TIMEOUT) == 1L) {
|
||||
u.usick_type = 0;
|
||||
Sick = 0;
|
||||
set_itimeout(&Sick, 0L);
|
||||
}
|
||||
if (how == CHOKING) init_uhunger();
|
||||
nomovemsg = "You survived that attempt on your life.";
|
||||
|
||||
Reference in New Issue
Block a user