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

intrinsics revamp (trunk only)

Browse Source 
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:
nethack.rankin
2011-10-01 00:25:57 +00:00
parent cd8eefb622
commit 84f02bd336
24 changed files with 231 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pray.c
View File

@@ -224,10 +224,10 @@ in_trouble()
&& !u.usteed
#endif
) return (TROUBLE_WOUNDED_LEGS);
if(u.uhs >= HUNGRY) return(TROUBLE_HUNGRY);
if(HStun) return (TROUBLE_STUNNED);
if(HConfusion) return (TROUBLE_CONFUSED);
if(Hallucination) return(TROUBLE_HALLUCINATION);
if (u.uhs >= HUNGRY) return TROUBLE_HUNGRY;
if (HStun & TIMEOUT) return TROUBLE_STUNNED;
if (HConfusion & TIMEOUT) return TROUBLE_CONFUSED;
if (HHallucination & TIMEOUT) return TROUBLE_HALLUCINATION;
return(0);
}
@@ -1019,7 +1019,9 @@ pleased(g_align)
break;
}
case 5: {
const char *msg="\"and thus I grant thee the gift of %s!\"";
static NEARDATA const char
msg[] = "\"and thus I grant thee the gift of %s!\"";
godvoice(u.ualign.type, "Thou hast pleased me with thy progress,");
if (!(HTelepat & INTRINSIC)) {
HTelepat |= FROMOUTSIDE;