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

Merge branch 'copperwater-pr464' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2021-02-19 07:50:34 -05:00
parent bea69f39f3 fb0b535cde
commit 7bc8d98ea3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes37.0
View File

@@ -511,6 +511,7 @@ change to can_reach_floor() resulted in hero being unable to reach the floor
when held by a lichen
panic if lua init fails
change wizard mode command #wizmgender to wizard mode option 'wizmgender'
engraving with non-blade dulled the weapon anyway (pr #464)
curses: 'msg_window' option wasn't functional for curses unless the binary
also included tty support

6
src/engrave.c
View File

@@ -1133,15 +1133,15 @@ engrave(void)
}
}
dulling_wep = (stylus && stylus->oclass == WEAPON_CLASS
dulling_wep = (carving && stylus && stylus->oclass == WEAPON_CLASS
&& (stylus->otyp != ATHAME || stylus->cursed));
marker = (stylus && stylus->otyp == MAGIC_MARKER);
g.context.engraving.actionct++;
/* sanity checks */
if (dulling_wep && !carving) {
impossible("using weapon for non-carve engraving");
if (dulling_wep && !is_blade(stylus)) {
impossible("carving with non-bladed weapon");
}
else if (g.context.engraving.type == MARK && !marker) {
impossible("making graffiti with non-marker stylus");