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

Fix: engraving with non-blade dulled the weapon anyway

Browse Source 
Due to a logic bug introduced when engraving became an occupation - the
code that tests to see whether the player is writing with a weapon that
will get dulled wasn't correctly checking that they were actually
carving an engraving.
This commit is contained in:
copperwater
2021-02-19 00:25:45 -05:00
parent a646764cc7
commit 3219ed1aa8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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");