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

Merge branch 'pr773' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2022-05-27 16:08:55 -04:00
parent 3a1d49710c 2af1acce8b
commit 947d65a27d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes3-7-0.txt
View File

@@ -1799,6 +1799,7 @@ split adjusting attributes into separate function (pr #757 by argrath)
split getting damages with a kick into separate function (pr #758 by argrath) split getting damages with a kick into separate function (pr #758 by argrath)
split fixing curse trouble into separate function (pr #765 by argrath) split fixing curse trouble into separate function (pr #765 by argrath)
Handle -eaux plurals in makeplural/makesingular (pr #767 by entrez) Handle -eaux plurals in makeplural/makesingular (pr #767 by entrez)
mdisplacem stoning and gloves had test backwards (pr #773 by entrez)
Code Cleanup and Reorganization Code Cleanup and Reorganization

9
src/mhitm.c
View File

@@ -226,13 +226,18 @@ mdisplacem(register struct monst *magr, register struct monst *mdef,
g.vis = (canspotmon(magr) && canspotmon(mdef)); g.vis = (canspotmon(magr) && canspotmon(mdef));
if (touch_petrifies(pd) && !resists_ston(magr)) { if (touch_petrifies(pd) && !resists_ston(magr)) {
if (which_armor(magr, W_ARMG) != 0) { if (!which_armor(magr, W_ARMG)) {
if (poly_when_stoned(pa)) { if (poly_when_stoned(pa)) {
mon_to_stone(magr); mon_to_stone(magr);
return MM_HIT; /* no damage during the polymorph */ return MM_HIT; /* no damage during the polymorph */
} }
if (!quietly && canspotmon(magr)) if (!quietly && canspotmon(magr)) {
if (g.vis) {
pline("%s tries to move %s out of %s way.", Monnam(magr),
mon_nam(mdef), is_rider(pa) ? "the" : mhis(magr));
}
pline("%s turns to stone!", Monnam(magr)); pline("%s turns to stone!", Monnam(magr));
}
monstone(magr); monstone(magr);
if (!DEADMONSTER(magr)) if (!DEADMONSTER(magr))
return MM_HIT; /* lifesaved */ return MM_HIT; /* lifesaved */