petrification fixes

Eliminate the somewhat redundant "You die..." following "You turned
to stone..." when becoming petrified by touching a cockatrice (reported
by <email deleted> for kicking, but occurs for weaponless hitting too).
Also, if a cockatrice killed you with normal damage, your tombstone would
erroneously report petrification and presumeably there'd be a statue
instead of a ghost in the resulting bones file.  This fixes both things.
This commit is contained in:
nethack.rankin
2006-11-10 05:13:57 +00:00
parent f8f5642d3a
commit 2fa9bd0301
6 changed files with 13 additions and 15 deletions

View File

@@ -1169,8 +1169,7 @@ dopois:
}
make_stoned(5L, (char *)0, kformat, kname);
return(1);
/* You("turn to stone..."); */
/* done_in_by(mtmp); */
/* done_in_by(mtmp, STONING); */
}
}
}
@@ -1518,7 +1517,7 @@ dopois:
default: dmg = 0;
break;
}
if(u.uhp < 1) done_in_by(mtmp);
if (u.uhp < 1) done_in_by(mtmp, DIED);
/* Negative armor class reduces damage done instead of fully protecting
* against hits.
@@ -2059,7 +2058,7 @@ register int n;
if (u.mh < 1) rehumanize();
} else {
u.uhp -= n;
if(u.uhp < 1) done_in_by(mtmp);
if (u.uhp < 1) done_in_by(mtmp, DIED);
}
}