merge NetHack-3.6.2 into master part 2

This commit is contained in:
nhmall
2019-01-23 00:53:35 -05:00
parent 66a5010070
commit 314ae68c2b
3 changed files with 15 additions and 15 deletions
+2 -2
View File
@@ -49,7 +49,7 @@ boolean clumsy;
if (mon->data == &mons[PM_SHADE])
dmg = 0;
specialdmg = special_dmgval(&youmonst, mon, W_ARMF, (long *) 0);
specialdmg = special_dmgval(&g.youmonst, mon, W_ARMF, (long *) 0);
if (mon->data == &mons[PM_SHADE] && !specialdmg) {
pline_The("%s.", kick_passes_thru);
@@ -198,7 +198,7 @@ xchar x, y;
continue;
kickdieroll = rnd(20);
specialdmg = special_dmgval(&youmonst, mon, W_ARMF, (long *) 0);
specialdmg = special_dmgval(&g.youmonst, mon, W_ARMF, (long *) 0);
if (mon->data == &mons[PM_SHADE] && !specialdmg) {
/* doesn't matter whether it would have hit or missed,
and shades have no passive counterattack */