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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-04-22 14:36:58 -04:00
parent e4ac043747 b2459229da
commit d15496ba31
30 changed files with 126 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mthrowu.c
View File

@@ -305,7 +305,7 @@ boolean verbose; /* give message(s) even when you can't see what happened */
struct obj *mon_launcher = g.marcher ? MON_WEP(g.marcher) : NULL;
g.notonhead = (g.bhitpos.x != mtmp->mx || g.bhitpos.y != mtmp->my);
ismimic = mtmp->m_ap_type && mtmp->m_ap_type != M_AP_MONSTER;
ismimic = M_AP_TYPE(mtmp) && M_AP_TYPE(mtmp) != M_AP_MONSTER;
vis = cansee(g.bhitpos.x, g.bhitpos.y);
tmp = 5 + find_mac(mtmp) + omon_adj(mtmp, otmp, FALSE);
@@ -1065,8 +1065,8 @@ register struct monst *mtmp;
/* hero concealment usually trumps monst awareness of being lined up */
if (Upolyd && rn2(25)
&& (u.uundetected || (g.youmonst.m_ap_type != M_AP_NOTHING
&& g.youmonst.m_ap_type != M_AP_MONSTER)))
&& (u.uundetected || (U_AP_TYPE != M_AP_NOTHING
&& U_AP_TYPE != M_AP_MONSTER)))
return FALSE;
ignore_boulders = (throws_rocks(mtmp->data)